X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Fdrun.sh;h=775c0c45e6b279d3c104b1c3d6d8177d3fbec90d;hb=924b18d7469204ceaae60d7345712ea09f75a674;hp=601feaf366d9fc7cb9ac77cc58dbd7280f446dcb;hpb=33e7b1a9fa15b0b699d16e359b406195b7fe87be;p=aaf%2Fauthz.git

diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index 601feaf3..775c0c45 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -1,7 +1,5 @@
-HOSTNAME=meriadoc.mithril.sbc.com
-HOST_IP=172.17.0.3
-CASS_HOST="cass.mithril.sbc.com:172.17.0.3"
-VERSION=2.1.0-SNAPSHOT
+#!/bin/bash drun.sh
+. d.props
 
 if [ "$1" == "" ]; then
   AAF_COMPONENTS=`ls ../aaf_${VERSION}/bin | grep -v '\.'`
@@ -10,10 +8,9 @@ else
 fi
   
 for AAF_COMPONENT in ${AAF_COMPONENTS}; do 
-	
 	case "$AAF_COMPONENT" in
 		"service") PORTMAP="8100:8100";;
-		"locate") PORTMAP="443:8095";;
+		"locate") PORTMAP="8095:8095";;
 		"oauth") PORTMAP="8140:8140";;
 		"gui") PORTMAP="8200:8200";;
 		"cm") PORTMAP="8150:8150";;
@@ -21,15 +18,17 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
 		"fs") PORTMAP="80:8096";;
 	esac
 	
-#	if [ "`docker container ls | grep aaf_$AAF_COMPONENT:$VERSION`" == "" ]; then 
-		docker run \
+#	if [ "`docker container ls | grep aaf_$AAF_COMPONENT:$VERSION`" == "" ]; then
+		echo Starting aaf_$AAF_COMPONENT...
+		docker run  \
+		  -d \
 		  --name aaf_$AAF_COMPONENT \
 		  --hostname="$HOSTNAME" \
 		  --add-host="$CASS_HOST" \
 		  --publish $PORTMAP \
-		  --volume=/opt/app/osaaf/etc:/opt/app/osaaf/etc \
+		  --mount type=bind,source=$CONF_ROOT_DIR,target=/opt/app/osaaf \
 		  --link aaf_cass:cassandra \
-		  aaf_$AAF_COMPONENT:$VERSION
+		  ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}
 #	else
 	  #echo docker container start -ia aaf_$AAF_COMPONENT
 #	fi