From 571ed63dde2aca036c15f282dd2a6967f722643a Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Wed, 14 Dec 2022 12:20:15 +0100
Subject: [PATCH] B #6012: Do not remove all images on cleanup
- Missing check (fails when no images are registered)
- Added additional check for image_name not empty
---
src/datastore_mad/remotes/docker_downloader.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/datastore_mad/remotes/docker_downloader.sh b/src/datastore_mad/remotes/docker_downloader.sh
index 7706d97507..9823989574 100755
--- a/src/datastore_mad/remotes/docker_downloader.sh
+++ b/src/datastore_mad/remotes/docker_downloader.sh
@@ -58,10 +58,13 @@ image_name=$(echo "$MARKET_URL" | cut -d "/" -f3 | cut -d "?" -f1)
#-------------------------------------------------------------------------------
function clean {
docker rm -f "$container_id" > /dev/null 2>&1 || true
- docker rmi $(docker images -q) -f
- docker rmi -f $image_name
+
+ if [ -n "${image_name}" ]; then
+ docker rmi -f "${image_name}"
+ fi
+
docker image rm -f one"$sid" > /dev/null 2>&1
-
+
rm -rf "$dockerdir"
}