X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Fdrun.sh;h=03d8e9cd9d0cbc3181634d898e246387fa6c4028;hb=58c2a7132f861e269ed707eb585657b0c9ead9f5;hp=cdd8b3c48d89f642b7bde18614e90da3b7f9a4b9;hpb=4a6523ac6345ad0993e58affcb8784828379b70b;p=aaf%2Fauthz.git

diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index cdd8b3c4..03d8e9cd 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -71,7 +71,7 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
         ;;
     "fs")
         PUBLISH="--publish 80:8096"
-        LINKS=""
+        LINKS="--link aaf-locate"
 	CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-fs aaf-locate && exec bin/fs"
         ;;
     "hello")
@@ -91,14 +91,22 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
        #ADD_HOST="$ADD_HOST --add-host=$CASS_HOST"
     #fi
     #--hostname="${AAF_COMPONENT}.${NAMESPACE}" \
+    #    --env aaf_locate_url=https://aaf-locate:8095 \
     #	$ADD_HOST \
+    if [ -n "${DUSER}" ]; then
+       THE_USER="--user $DUSER"
+    fi
     $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 +116,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