From 8942bcf6590a79a04f7ed36355f2910d0f823950 Mon Sep 17 00:00:00 2001
From: Daniel Boca <111969083+ONdboca@users.noreply.github.com>
Date: Fri, 2 Dec 2022 10:54:33 +0100
Subject: [PATCH] B #6012: Clean func for docker images 6012 (#2390)

---
 src/datastore_mad/remotes/docker_downloader.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/datastore_mad/remotes/docker_downloader.sh b/src/datastore_mad/remotes/docker_downloader.sh
index af79a026e4..7706d97507 100755
--- a/src/datastore_mad/remotes/docker_downloader.sh
+++ b/src/datastore_mad/remotes/docker_downloader.sh
@@ -49,14 +49,19 @@ CONTEXT_PATH="$SHARE_LOCATION/context"
 DOCKERFILES="$SHARE_LOCATION/dockerhub/dockerfiles"
 DOCKERFILE="$SHARE_LOCATION/dockerhub"
 
+#Docker image name for deletion
+image_name=$(echo "$MARKET_URL" | cut -d "/" -f3 | cut -d "?" -f1)
+
 #-------------------------------------------------------------------------------
 # This function takes care of removing all temporary directories in case
 # something fails
 #-------------------------------------------------------------------------------
 function clean {
     docker rm -f "$container_id" > /dev/null 2>&1 || true
+    docker rmi $(docker images -q) -f
+    docker rmi -f $image_name
     docker image rm -f one"$sid" > /dev/null 2>&1
-
+    
     rm -rf "$dockerdir"
 }