From 679f142a91b165a958b5739808d6409d6960b6f4 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Fri, 6 Apr 2018 14:59:36 -0500 Subject: Make cross-container access work Issue-ID: AAF-218 Change-Id: Ib31646e3ce6e38c2ef0a02fe1d2f57cf963a5a4a Signed-off-by: Instrumental --- auth/docker/drun.sh | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) (limited to 'auth/docker/drun.sh') diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh index 179a7da8..80414ea4 100644 --- a/auth/docker/drun.sh +++ b/auth/docker/drun.sh @@ -9,24 +9,43 @@ fi for AAF_COMPONENT in ${AAF_COMPONENTS}; do case "$AAF_COMPONENT" in - "service") PORTMAP="8100:8100";; - "locate") PORTMAP="8095:8095";; - "oauth") PORTMAP="8140:8140";; - "gui") PORTMAP="8200:8200";; - "cm") PORTMAP="8150:8150";; - "hello") PORTMAP="8130:8130";; - "fs") PORTMAP="80:8096";; + "service") + PORTMAP="8100:8100" + LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST" + ;; + "locate") + PORTMAP="8095:8095" + LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST" + ;; + "oauth") + PORTMAP="8140:8140" + LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST" + ;; + "gui") + PORTMAP="8200:8200" + ;; + "cm") + PORTMAP="8150:8150" + LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST" + ;; + "hello") + PORTMAP="8130:8130" + ;; + "fs") + PORTMAP="80:8096" + ;; esac echo Starting aaf_$AAF_COMPONENT... + docker run \ -d \ --name aaf_$AAF_COMPONENT \ - --hostname="$HOSTNAME" \ - --add-host="$CASS_HOST" \ + --hostname="${AAF_COMPONENT}.aaf.osaaf.org" \ + --add-host="$HOSTNAME:$HOST_IP" \ + --add-host="aaf.osaaf.org:$HOST_IP" \ + ${LINKS} \ --publish $PORTMAP \ --mount type=bind,source=$CONF_ROOT_DIR,target=/opt/app/osaaf \ - --link aaf_cass:cassandra \ ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} done -# --add-host="$HOSTNAME:$HOST_IP" \ -- cgit 1.2.3-korg