summaryrefslogtreecommitdiffstats
path: root/auth/docker
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-10-03 21:36:44 -0500
committerInstrumental <jonathan.gathman@att.com>2018-10-03 21:36:48 -0500
commit235dd9ad5309cb8c348e15c66fb3884d39dbb107 (patch)
tree615198ec92813d719f00f90f9b86cace35fafe02 /auth/docker
parent1e3be601c78fa851333e51c6498713d1c412bd62 (diff)
Adjust start scripts
Issue-ID: AAF-517 Change-Id: I487c2e8adb76bc85d54755a650e0a499a6425a8c Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/docker')
-rw-r--r--auth/docker/dclean.sh6
-rw-r--r--auth/docker/drun.sh3
2 files changed, 1 insertions, 8 deletions
diff --git a/auth/docker/dclean.sh b/auth/docker/dclean.sh
index d83a1329..f8550674 100644
--- a/auth/docker/dclean.sh
+++ b/auth/docker/dclean.sh
@@ -8,14 +8,10 @@ else
AAF_COMPONENTS="$@"
fi
-docker image rm $ORG/$PROJECT/aaf_agent:${VERSION}
-docker image rm $ORG/$PROJECT/aaf_config:${VERSION}
-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
+ 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
diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index a8f03936..96405f24 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -67,9 +67,6 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
for A in aaf.osaaf.org $AH_ROOT; do
ADD_HOST="$ADD_HOST --add-host=$A:$HOST_IP"
- for SA in service locate oauth gui fs cm hello; do
- ADD_HOST="$ADD_HOST --add-host=$SA.$A:$HOST_IP"
- done
done
docker run \