Configuration Agent and MS for AAF

[aaf/authz.git] / auth / docker / dclean.sh

diff --git a/auth/docker/dclean.sh b/auth/docker/dclean.sh
index 4c2dd3b..163272d 100644 (file)
--- a/auth/docker/dclean.sh
+++ b/auth/docker/dclean.sh
@@ -1,9 +1,6 @@
-#!/bin/bash dclean.sh
-ORG=onap
-PROJECT=aaf
-DOCKER_REPOSITORY=nexus3.onap.org:10003
-VERSION=2.1.0-SNAPSHOT
-./d.props
+#!/bin/bash 
+# Pull in Variables from d.props
+. ./d.props
 
 if [ "$1" == "" ]; then
   AAF_COMPONENTS=`ls ../aaf_${VERSION}/bin | grep -v '\.'`
@@ -11,8 +8,10 @@ else
   AAF_COMPONENTS=$1
 fi
 
+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}
 done
 echo "Y" | docker image prune