Merge "Sonar fix: Perm.java"

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

diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh
index ac88839..b498428 100644 (file)
--- a/auth/docker/aaf.sh
+++ b/auth/docker/aaf.sh
@@ -23,11 +23,17 @@
 
 DOCKER=${DOCKER:=docker}
 # if something, may not want CASS attached all the tim
-LINKS="--link $CASSANDRA_DOCKER"
+#LINKS="--link $CASSANDRA_DOCKER"
+
+# DOCKER doesn't have DNS out of the box, only links.  
+# so we add cm_always_ignore_ips in --env
 
 function run_it() {
+  if [ -n "${DUSER}" ]; then
+    USER_LINE="--user ${DUSER}"
+  fi
   $DOCKER run $@ \
-    --user aaf \
+    $USER_LINE \
     -v "aaf_config:$CONF_ROOT_DIR" \
     -v "aaf_status:/opt/app/aaf/status" \
     $LINKS \
@@ -35,7 +41,8 @@ function run_it() {
     --env aaf_locator_container_ns=${NAMESPACE} \
     --env aaf_locator_fqdn=${HOSTNAME} \
     --env aaf_locate_url=https://aaf-locate:8095 \
-    --env aaf_locator_public_hostname=${HOSTNAME} \
+    --env aaf_locator_public_fqdn=${HOSTNAME} \
+    --env cm_always_ignore_ips=true \
     --env AAF_ENV=${AAF_ENV} \
     --env LATITUDE=${LATITUDE} \
     --env LONGITUDE=${LONGITUDE} \