Cleanups docker images during and after build to fix disk usage issue.

Author: dinogun

build_all.sh

@@ -16,11 +16,12 @@ set -o pipefail
 
 source ./common_functions.sh
 
-# Cleanup any old containers and images
-cleanup_images
-
 for ver in ${supported_versions}
 do
+	# Cleanup any old containers and images
+	cleanup_images
+	cleanup_manifest
+
 	# Remove any temporary files
 	rm -f hotspot_shasums_latest.sh openj9_shasums_latest.sh push_commands.sh
 
@@ -66,3 +67,7 @@ do
 	echo "test_tags" > ${test_image_types_file}
 	./test_multiarch.sh ${ver}
 done
+
+# Cleanup any old containers and images
+cleanup_images
+cleanup_manifest

common_functions.sh

@@ -135,7 +135,7 @@ function cleanup_images() {
 	docker rm $(docker ps -a | grep "Exited" | awk '{ print $1 }') 2>/dev/null
 
 	# Delete any old images for our target_repo on localhost.
-	docker rmi -f $(docker images | grep -e "${target_repo}" | awk '{ print $3 }' | sort | uniq) 2>/dev/null
+	docker rmi -f $(docker images | grep -e "adoptopenjdk" | awk '{ print $3 }' | sort | uniq) 2>/dev/null
 }
 
 function cleanup_manifest() {

test_all.sh

@@ -16,11 +16,12 @@ set -o pipefail
 
 source ./common_functions.sh
 
-# Cleanup any old containers and images
-cleanup_images
-
 for ver in ${supported_versions}
 do
+	# Cleanup any old containers and images
+	cleanup_images
+	cleanup_manifest
+
 	# Remove any temporary files
 	rm -f hotspot_shasums_latest.sh openj9_shasums_latest.sh push_commands.sh manifest_commands.sh
 
@@ -41,3 +42,7 @@ do
 		exit 1;
 	fi
 done
+
+# Cleanup any old containers and images
+cleanup_images
+cleanup_manifest

update_manifest_all.sh

@@ -16,12 +16,12 @@ set -o pipefail
 
 source ./common_functions.sh
 
-# Cleanup any old containers, images and manifest entries.
-cleanup_images
-cleanup_manifest
-
 for ver in ${supported_versions}
 do
+	# Cleanup any old containers, images and manifest entries.
+	cleanup_images
+	cleanup_manifest
+
 	# Remove any temporary files
 	rm -f hotspot_shasums_latest.sh openj9_shasums_latest.sh manifest_commands.sh
 
@@ -67,3 +67,7 @@ do
 	cp ${test_image_types_all_file} ${test_image_types_file}
 	./test_multiarch.sh ${ver}
 done
+
+# Cleanup any old containers, images and manifest entries.
+cleanup_images
+cleanup_manifest