From e44d2f770f28c3290863e509cb2406dcb67bd686 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Thu, 16 Aug 2018 17:22:45 -0500 Subject: Fix shs for REPO Issue-ID: AAF-419 Change-Id: I2cec912c935a28c818ad4358cd236c153de54c30 Signed-off-by: Instrumental --- auth/docker/dclean.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'auth/docker/dclean.sh') 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 -- cgit 1.2.3-korg