Merge pull request #371 from andrewhsu/clean

[19.03] Jenkinsfile: ensure all containers are cleaned up
docker-archive · Sep 20, 2019 · 23c7134 · 23c7134
2 parents 2399b7a + 4b5c535
commit 23c7134
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -662,6 +662,8 @@ pipeline {
                             sh '''
                             echo "Ensuring container killed."
                             docker rm -vf docker-pr$BUILD_NUMBER || true
+                            cids=$(docker ps -aq -f name=docker-pr${BUILD_NUMBER}-*)
+                            [ -n "$cids" ] && docker rm -vf $cids || true
                             '''
 
                             sh '''