From 1e3be601c78fa851333e51c6498713d1c412bd62 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Wed, 3 Oct 2018 19:40:44 -0500 Subject: Change FQDN Register Issue-ID: AAF-517 Change-Id: I816e7a18f94e7f7fcfc269b29328d7009fc8f858 Signed-off-by: Instrumental --- auth/docker/drun.sh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'auth/docker') diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh index 350ce3db..a8f03936 100644 --- a/auth/docker/drun.sh +++ b/auth/docker/drun.sh @@ -59,13 +59,29 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do echo Starting aaf_$AAF_COMPONENT... + if [ -n "$AAF_REGISTER_AS" ] && [ "$HOSTNAME" != "$AAF_REGISTER_AS" ]; then + AH_ROOT="$HOSTNAME $AAF_REGISTER_AS" + else + AH_ROOT="$HOSTNAME" + fi + + for A in aaf.osaaf.org $AH_ROOT; do + ADD_HOST="$ADD_HOST --add-host=$A:$HOST_IP" + for SA in service locate oauth gui fs cm hello; do + ADD_HOST="$ADD_HOST --add-host=$SA.$A:$HOST_IP" + done + done + 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" \ + $ADD_HOST \ ${LINKS} \ + --env AAF_ENV=${AAF_ENV} \ + --env AAF_REGISTER_AS=${AAF_REGISTER_AS} \ + --env LATITUDE=${LATITUDE} \ + --env LONGITUDE=${LONGITUDE} \ --publish $PORTMAP \ --mount 'type=volume,src=aaf_config,dst='$CONF_ROOT_DIR',volume-driver=local' \ ${PREFIX}${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} -- cgit