X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Fdrun.sh;h=57a61676403104175362352e5ea6fbadc509991d;hb=4a5f63f7f149ecba9556ee67a4ca00fb51845bf0;hp=ed62e573e66059bd4f04027a036bdeac1128fc84;hpb=12414fe43077e12d7ef711951b1633ad31d73573;p=aaf%2Fauthz.git

diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index ed62e573..57a61676 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -42,9 +42,9 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
     "service")
         PUBLISH="--publish 8100:8100"
         if [ -z "$CASSANDRA_DOCKER" ]; then
-	  CMD_LINE="cd /opt/app/aaf && /bin/bash pod/pod_wait.sh aaf-service && exec bin/service"
+	  CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-service && exec bin/service"
         else
-	  CMD_LINE="cd /opt/app/aaf && /bin/bash pod/pod_wait.sh aaf-service aaf-cass && exec bin/service"
+	  CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-service aaf-cass && exec bin/service"
           LINKS="--link $CASSANDRA_DOCKER"
 	  echo $CASSANDRA_CLUSTER
         fi
@@ -52,53 +52,52 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
     "locate")
         PUBLISH="--publish 8095:8095"
         LINKS="--link aaf-cass --link aaf-service"
-	CMD_LINE="cd /opt/app/aaf && /bin/bash pod/pod_wait.sh aaf-locate aaf-service && exec bin/locate"
+	CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-locate aaf-service && exec bin/locate"
         ;;
     "oauth")
         PUBLISH="--publish 8140:8140"
         LINKS="--link aaf-cass --link aaf-service --link aaf-locate"
-	CMD_LINE="cd /opt/app/aaf && /bin/bash pod/pod_wait.sh aaf-oauth aaf-service && exec bin/oauth"
+	CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-oauth aaf-service && exec bin/oauth"
         ;;
     "cm")
         PUBLISH="--publish 8150:8150"
-        LINKS="--link aaf-cass --link aaf-service --link aaf-locate"
-	CMD_LINE="cd /opt/app/aaf && /bin/bash pod/pod_wait.sh aaf-cm aaf-locate && exec bin/cm"
+        LINKS="--link aaf-cass --link aaf-service --link aaf-locate --link aaf-oauth"
+	CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-cm aaf-locate && exec bin/cm"
         ;;
     "gui")
         PUBLISH="--publish 8200:8200"
         LINKS="--link aaf-service --link aaf-locate --link aaf-oauth --link aaf-cm"
-	CMD_LINE="cd /opt/app/aaf && /bin/bash pod/pod_wait.sh aaf-gui aaf-locate && exec bin/gui"
+	CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-gui aaf-locate && exec bin/gui"
         ;;
     "fs")
         PUBLISH="--publish 80:8096"
-        LINKS=""
-	CMD_LINE="cd /opt/app/aaf && /bin/bash pod/pod_wait.sh aaf-fs aaf-locate && exec bin/fs"
+        LINKS="--link aaf-locate"
+	CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-fs aaf-locate && exec bin/fs"
         ;;
     "hello")
         PUBLISH="--publish 8130:8130"
         LINKS="--link aaf-service --link aaf-locate --link aaf-oauth --link aaf-cm"
-	CMD_LINE="cd /opt/app/aaf && /bin/bash pod/pod_wait.sh aaf-hello aaf-locate && exec bin/hello"
+	CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-hello aaf-locate && exec bin/hello"
         ;;
     esac
 
     echo Starting aaf-$AAF_COMPONENT...
+    if [ -n "${DUSER}" ]; then
+       THE_USER="--user $DUSER"
+    fi
 
-    #for A in aaf.osaaf.org $AH_ROOT; do 
-       #ADD_HOST="$ADD_HOST --add-host=$A:$HOST_IP"
-    #done
 
-    #if [ ! -z "$LINKS" ] && [[ "$CASS_HOST" =~ ":" ]]; then
-       #ADD_HOST="$ADD_HOST --add-host=$CASS_HOST"
-    #fi
-    #--hostname="${AAF_COMPONENT}.${NAMESPACE}" \
-    #	$ADD_HOST \
     $DOCKER run  \
         -d \
+        ${THE_USER} \
         --name aaf-$AAF_COMPONENT \
         ${LINKS} \
         --env AAF_ENV=${AAF_ENV} \
         --env aaf_locator_container=docker \
-        --env aaf_locator_fqdn=$HOSTNAME \
+        --env aaf_locator_container_ns=${NAMESPACE} \
+        --env aaf_locator_fqdn=${HOSTNAME} \
+        --env aaf_locator_public_fqdn=${HOSTNAME} \
+        --env aaf_deployed_version=${VERSION} \
         --env LATITUDE=${LATITUDE} \
         --env LONGITUDE=${LONGITUDE} \
         --env CASSANDRA_CLUSTER=${CASSANDRA_CLUSTER} \
@@ -108,6 +107,6 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
         $PUBLISH \
         -v "aaf_config:$CONF_ROOT_DIR" \
         -v "aaf_status:/opt/app/aaf/status" \
-        ${PREFIX}${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} \
+        ${PREFIX}${ORG}/${PROJECT}/aaf_core:${VERSION} \
 	/bin/bash -c "$CMD_LINE"
 done