From 8a9b78468321ef19317670da7bfc66e147f77ee6 Mon Sep 17 00:00:00 2001
From: Tom Page <thomas.page@alfresco.com>
Date: Fri, 3 Apr 2020 11:41:48 +0100
Subject: [PATCH] If deleting specified images fails then try deleting all
 images instead.

This might be needed if we hit the 'image has dependent child images' issue.
---
 scripts/cleanImages.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/cleanImages.sh b/scripts/cleanImages.sh
index b0607ba391..4040ff5f8a 100755
--- a/scripts/cleanImages.sh
+++ b/scripts/cleanImages.sh
@@ -10,5 +10,11 @@ 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_images_list=$(docker images | awk '{print $3}' | uniq)
+        docker rmi -f $docker_images_list
+    fi
 fi