summaryrefslogtreecommitdiffstats
path: root/auth/docker
diff options
context:
space:
mode:
authorInstrumental <jcgmisc@stl.gathman.org>2018-04-10 15:03:24 -0500
committerInstrumental <jcgmisc@stl.gathman.org>2018-04-10 15:04:29 -0500
commitf482ea06ac55e56025c64916592f07db2c1fddd7 (patch)
tree6b7bfc87f085aaa8edf1fccb2db238e7b1c78500 /auth/docker
parentce6a67f4939900bbedaef5eeb986768fb4eec8ad (diff)
Create Functioning Client Sample for Docs
Issue-ID: AAF-221 Change-Id: Iaefe6700a900a712409bda7ddfd18932ed4c0fda Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>
Diffstat (limited to 'auth/docker')
-rw-r--r--auth/docker/Dockerfile5
-rw-r--r--auth/docker/d.props2
-rw-r--r--auth/docker/dbuild.sh6
-rw-r--r--auth/docker/drun.sh8
4 files changed, 6 insertions, 15 deletions
diff --git a/auth/docker/Dockerfile b/auth/docker/Dockerfile
index f2920de5..729a460e 100644
--- a/auth/docker/Dockerfile
+++ b/auth/docker/Dockerfile
@@ -15,11 +15,10 @@ COPY lib /opt/app/aaf/${AAF_COMPONENT}/lib
COPY theme /opt/app/aaf/${AAF_COMPONENT}/theme
COPY bin /opt/app/aaf/${AAF_COMPONENT}/bin
-CMD ["/bin/bash","/opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT}"]
+#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};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}"]
+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 08a96348..b955872a 100644
--- a/auth/docker/d.props
+++ b/auth/docker/d.props
@@ -7,7 +7,7 @@ CONF_ROOT_DIR=/opt/app/osaaf
# Local Env info
HOSTNAME=meriadoc.mithril.sbc.com
-HOST_IP=192.168.99.102
+HOST_IP=192.168.99.100
CASS_HOST=cass.aaf.osaaf.org:172.17.0.2
diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh
index ace2e507..23fa72f5 100644
--- a/auth/docker/dbuild.sh
+++ b/auth/docker/dbuild.sh
@@ -3,11 +3,7 @@
# Docker Building Script. Reads all the components generated by install, on per-version basis
#
# Pull in Variables from d.props
-ORG=onap
-PROJECT=aaf
-DOCKER_REPOSITORY=nexus3.onap.org:10003
-VERSION=2.1.0-SNAPSHOT
-./d.props
+. ./d.props
# TODO add ability to do DEBUG settings
if ["$1" == ""]; then
diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index 33f3014d..2b5f709a 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -1,9 +1,5 @@
#!/bin/bash drun.sh
-ORG=onap
-PROJECT=aaf
-DOCKER_REPOSITORY=nexus3.onap.org:10003
-VERSION=2.1.0-SNAPSHOT
-./d.props
+. ./d.props
if [ "$1" == "" ]; then
@@ -52,5 +48,5 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
${LINKS} \
--publish $PORTMAP \
--mount type=bind,source=$CONF_ROOT_DIR,target=/opt/app/osaaf \
- ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}
+ ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}
done