Fix shs for REPO

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

diff --git a/auth/docker/dclean.sh b/auth/docker/dclean.sh
index b502c02..d83a132 100644 (file)
--- a/auth/docker/dclean.sh
+++ b/auth/docker/dclean.sh
@@ -3,9 +3,9 @@
 . ./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}
@@ -15,5 +15,9 @@ docker image rm $ORG/$PROJECT/aaf_core:${VERSION}
 echo "Y" | docker container prune
 for AAF_COMPONENT in ${AAF_COMPONENTS}; do
     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