X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Fdclean.sh;h=38ce5189582a2ae56108232f4e34b5cc7eb56001;hb=7a1817bf3cf3c40c6c33f673ddc46c3f115cc3bc;hp=0bca9ef7cb77da7deafc3a7963fdfb0a4d3132a5;hpb=4ad4763d8c9191998cc671a884d1af5da6ba8bb9;p=aaf%2Fauthz.git

diff --git a/auth/docker/dclean.sh b/auth/docker/dclean.sh
index 0bca9ef7..38ce5189 100644
--- a/auth/docker/dclean.sh
+++ b/auth/docker/dclean.sh
@@ -1,18 +1,39 @@
 #!/bin/bash
+#########
+#  ============LICENSE_START====================================================
+#  org.onap.aaf
+#  ===========================================================================
+#  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+#  ===========================================================================
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#  ============LICENSE_END====================================================
+#
 # Pull in Variables from d.props
 . ./d.props
+DOCKER=${DOCKER:=docker}
 
 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_config:${VERSION}
-docker image rm $ORG/$PROJECT/aaf_core:${VERSION}
-
-echo "Y" | docker container prune
+echo "Y" | $DOCKER container prune
 for AAF_COMPONENT in ${AAF_COMPONENTS}; do
-    docker image rm $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
+echo "Y" | $DOCKER image prune