X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Fdrun.sh;h=e9805887262e648a5c06656346e1d1b2e26674d3;hb=1efda07f5d8e14d028fddf62dec62c95af9c7342;hp=601feaf366d9fc7cb9ac77cc58dbd7280f446dcb;hpb=47e19c7b188b70dc22b14bb1883c2401cb3c3126;p=aaf%2Fauthz.git

diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index 601feaf3..e9805887 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -1,37 +1,53 @@
-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
+# Pull in Variables from d.props
+. ./d.props
+
 
 if [ "$1" == "" ]; then
-  AAF_COMPONENTS=`ls ../aaf_${VERSION}/bin | grep -v '\.'`
+  AAF_COMPONENTS=`ls -r ../aaf_${VERSION}/bin | grep -v '\.'`
 else
   AAF_COMPONENTS=$1
 fi
   
 for AAF_COMPONENT in ${AAF_COMPONENTS}; do 
-	
 	case "$AAF_COMPONENT" in
-		"service") PORTMAP="8100:8100";;
-		"locate") PORTMAP="443:8095";;
-		"oauth") PORTMAP="8140:8140";;
-		"gui") PORTMAP="8200:8200";;
-		"cm") PORTMAP="8150:8150";;
-		"hello") PORTMAP="8130:8130";;
-		"fs") PORTMAP="80:8096";;
+		"service") 
+			PORTMAP="8100:8100"
+	  		LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST" 
+			;;
+		"locate") 
+			PORTMAP="8095:8095"
+	  		LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST" 
+			;;
+		"oauth") 
+			PORTMAP="8140:8140"
+	  		LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST" 
+			;;
+		"gui") 
+			PORTMAP="8200:8200"
+			;;
+		"cm") 
+			PORTMAP="8150:8150"
+	  		LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST" 
+			;;
+		"hello") 
+			PORTMAP="8130:8130"
+			;;
+		"fs") 
+			PORTMAP="80:8096"
+			;;
 	esac
 	
-#	if [ "`docker container ls | grep aaf_$AAF_COMPONENT:$VERSION`" == "" ]; then 
-		docker run \
-		  --name aaf_$AAF_COMPONENT \
-		  --hostname="$HOSTNAME" \
-		  --add-host="$CASS_HOST" \
-		  --publish $PORTMAP \
-		  --volume=/opt/app/osaaf/etc:/opt/app/osaaf/etc \
-		  --link aaf_cass:cassandra \
-		  aaf_$AAF_COMPONENT:$VERSION
-#	else
-	  #echo docker container start -ia aaf_$AAF_COMPONENT
-#	fi
+	echo Starting aaf_$AAF_COMPONENT...
+
+	docker run  \
+	  -d \
+	  --name aaf_$AAF_COMPONENT \
+	  --hostname="${AAF_COMPONENT}.aaf.osaaf.org" \
+	  --add-host="$HOSTNAME:$HOST_IP" \
+	  --add-host="aaf.osaaf.org:$HOST_IP" \
+	  ${LINKS} \
+	  --publish $PORTMAP \
+	  --mount type=bind,source=$CONF_ROOT_DIR,target=/opt/app/osaaf \
+	  ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} 
 done
-#		  --add-host="$HOSTNAME:$HOST_IP" \