Merge pull request #1328 from cfengine/docker-cleanup/3.21

Improved ci/clean-build-package.sh for use on a new system (3.21)
cfengine · Oct 31, 2023 · bfa8294 · bfa8294
2 parents 2f86236 + bbf52d7
commit bfa8294
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/ci/clean-build-package.sh b/ci/clean-build-package.sh
@@ -3,6 +3,12 @@ set -ex
 # clean up docker stuff
 name=cfengine-build-package
 # TODO: a softer clean might get into the container and run ./buildscripts/build-scripts/clean-buildmachine
-docker stop $name
-docker rm -f $name
-docker rmi -f $name
+if docker ps | grep $name; then
+  docker stop $name
+fi
+if docker ps -a | grep $name; then
+  docker rm $name
+fi
+if docker images | grep $name; then
+  docker rmi -f $name
+fi