Make cross-container access work
Issue-ID: AAF-218
Change-Id: Ib31646e3ce6e38c2ef0a02fe1d2f57cf963a5a4a
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>
diff --git a/auth/docker/Dockerfile b/auth/docker/Dockerfile
index ce785d5..f2920de 100644
--- a/auth/docker/Dockerfile
+++ b/auth/docker/Dockerfile
@@ -18,7 +18,8 @@
CMD ["/bin/bash","/opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT}"]
# For Debugging installation
-#CMD ["/bin/bash","-c","pwd;cd /opt/app/osaaf;find /opt/app/osaaf -depth;df -k; cat /opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT}"]
+# CMD ["/bin/bash","-c","pwd;cd /opt/app/osaaf;find /opt/app/osaaf -depth;df -k; cat /opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT};cat /etc/hosts"]
+#CMD ["/bin/bash","-c","pwd;cd /opt/app/osaaf;find /opt/app/osaaf -depth;df -k; cat /opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT};cat /etc/hosts;/opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT}"]
# Java Debugging VM Args
# "-Xdebug",\
# "-Xnoagent",\
diff --git a/auth/docker/d.props b/auth/docker/d.props
index 6fc232e..08a9634 100644
--- a/auth/docker/d.props
+++ b/auth/docker/d.props
@@ -7,7 +7,7 @@
# Local Env info
HOSTNAME=meriadoc.mithril.sbc.com
-HOST_IP=172.17.0.3
+HOST_IP=192.168.99.102
CASS_HOST=cass.aaf.osaaf.org:172.17.0.2
diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index 179a7da..80414ea 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -9,24 +9,43 @@
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" \