Reduce Docker Layers

[aaf/authz.git] / auth / docker / drun.sh

diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index 6fc3a9a..03d8e9c 100644 (file)
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -91,15 +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 \
-        --user aaf \
+        ${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} \
@@ -109,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