X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Fdclean.sh;h=d83a13298b6675555d384f83313aa5846543c6c2;hb=ca35efd89efda8022d4e70187574891890f64926;hp=7887b67745d0b4921f91363e868b99788af06eab;hpb=4246fcf2c5b4f643a816aa4a7fed06b399d04511;p=aaf%2Fauthz.git

diff --git a/auth/docker/dclean.sh b/auth/docker/dclean.sh
index 7887b677..d83a1329 100644
--- a/auth/docker/dclean.sh
+++ b/auth/docker/dclean.sh
@@ -1,15 +1,23 @@
-#!/bin/bash 
+#!/bin/bash
 # Pull in Variables from d.props
 . ./d.props
 
 if [ "$1" == "" ]; then
-  AAF_COMPONENTS=`ls ../aaf_${VERSION}/bin | grep -v '\.'`
+    AAF_COMPONENTS="$(cat components) config core agent"
 else
-  AAF_COMPONENTS=$1
+    AAF_COMPONENTS="$@"
 fi
 
+docker image rm $ORG/$PROJECT/aaf_agent:${VERSION}
+docker image rm $ORG/$PROJECT/aaf_config:${VERSION}
+docker image rm $ORG/$PROJECT/aaf_core:${VERSION}
+
 echo "Y" | docker container prune
 for AAF_COMPONENT in ${AAF_COMPONENTS}; do
-  docker image rm $DOCKER_REPOSITORY/$ORG/$PROJECT/aaf_$AAF_COMPONENT:${VERSION}
+    docker image rm $ORG/$PROJECT/aaf_$AAF_COMPONENT:${VERSION}
+    if [ "$PREFIX" = "" ]; then
+      docker image rm $DOCKER_REPOSITORY/$ORG/$PROJECT/aaf_$AAF_COMPONENT:${VERSION}
+      docker image rm $DOCKER_REPOSITORY/$ORG/$PROJECT/aaf_$AAF_COMPONENT:latest
+    fi
 done
 echo "Y" | docker image prune