From 0aa5fd9d0a5db0acfaa2e4f2279247152e0e742b Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 8 Apr 2020 09:27:53 +0100 Subject: [PATCH] Merge pull request #1119 from Alfresco/feature/FallbackToDeleteAllImages If deleting specified images fails then try deleting all images instead. (cherry picked from commit 5e41d17941976f23ee9753b2b9f93d8ee0a874b1) --- scripts/cleanImages.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/cleanImages.sh b/scripts/cleanImages.sh index b0607ba391..8d58cfdc02 100755 --- a/scripts/cleanImages.sh +++ b/scripts/cleanImages.sh @@ -10,5 +10,10 @@ if [ "$docker_images_list" == "" ]; then echo "No docker images on the agent" else echo "Clearing images: $docker_images_list" - docker rmi -f $docker_images_list + if docker rmi -f $docker_images_list ; then + echo "Deleting images was successful." + else + echo "Deleting specified images failed, so falling back to delete ALL images on system." + docker rmi -f $(docker images -aq) + fi fi