X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Fdclean.sh;h=d83a13298b6675555d384f83313aa5846543c6c2;hb=e44d2f770f28c3290863e509cb2406dcb67bd686;hp=b502c022050a0eb86a5894bdb26ee520e5b1715d;hpb=e92a354be569d7be3d6e11ab11e32bd78ff9227d;p=aaf%2Fauthz.git diff --git a/auth/docker/dclean.sh b/auth/docker/dclean.sh index b502c022..d83a1329 100644 --- 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