summaryrefslogtreecommitdiffstats
path: root/auth/docker
diff options
context:
space:
mode:
Diffstat (limited to 'auth/docker')
-rw-r--r--auth/docker/Dockerfile4
-rwxr-xr-x[-rw-r--r--]auth/docker/dbuild.sh0
-rw-r--r--auth/docker/dclean.sh7
-rw-r--r--auth/docker/dpush.sh10
-rw-r--r--auth/docker/drun.sh3
-rw-r--r--auth/docker/dstart.sh7
-rw-r--r--auth/docker/dstop.sh5
7 files changed, 12 insertions, 24 deletions
diff --git a/auth/docker/Dockerfile b/auth/docker/Dockerfile
index 729a460e..7afe69d8 100644
--- a/auth/docker/Dockerfile
+++ b/auth/docker/Dockerfile
@@ -15,10 +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","-c","/opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT} >> /opt/app/osaaf/logs/${AAF_COMPONENT}/stdout`date -I` 2>> /opt/app/osaaf/logs/${AAF_COMPONENT}/stderr`date -I`"]
# 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;/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/dbuild.sh b/auth/docker/dbuild.sh
index 23fa72f5..23fa72f5 100644..100755
--- a/auth/docker/dbuild.sh
+++ b/auth/docker/dbuild.sh
diff --git a/auth/docker/dclean.sh b/auth/docker/dclean.sh
index 4c2dd3bf..d83f61c8 100644
--- a/auth/docker/dclean.sh
+++ b/auth/docker/dclean.sh
@@ -1,9 +1,6 @@
#!/bin/bash dclean.sh
-ORG=onap
-PROJECT=aaf
-DOCKER_REPOSITORY=nexus3.onap.org:10003
-VERSION=2.1.0-SNAPSHOT
-./d.props
+# Pull in Variables from d.props
+. ./d.props
if [ "$1" == "" ]; then
AAF_COMPONENTS=`ls ../aaf_${VERSION}/bin | grep -v '\.'`
diff --git a/auth/docker/dpush.sh b/auth/docker/dpush.sh
index a9a03875..99a88f96 100644
--- a/auth/docker/dpush.sh
+++ b/auth/docker/dpush.sh
@@ -1,12 +1,8 @@
#
# Docker push Script. Reads all the components generated by install, on per-version basis
#
-
-ORG=onap
-PROJECT=aaf
-DOCKER_REPOSITORY=nexus3.onap.org:10003
-VERSION=2.1.0-SNAPSHOT
-# TODO add ability to do DEBUG settings
+# Pull in Variables from d.props
+. ./d.props
if ["$1" == ""]; then
AAF_COMPONENTS=`ls ../aaf_*HOT/bin | grep -v '\.'`
@@ -17,4 +13,4 @@ fi
for AAF_COMPONENT in ${AAF_COMPONENTS}; do
docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}
-done \ No newline at end of file
+done
diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index 2b5f709a..b4c64d09 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -1,4 +1,5 @@
#!/bin/bash drun.sh
+# Pull in Variables from d.props
. ./d.props
@@ -40,7 +41,7 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
echo Starting aaf_$AAF_COMPONENT...
docker run \
- -d \
+ -i \
--name aaf_$AAF_COMPONENT \
--hostname="${AAF_COMPONENT}.aaf.osaaf.org" \
--add-host="$HOSTNAME:$HOST_IP" \
diff --git a/auth/docker/dstart.sh b/auth/docker/dstart.sh
index ac8ffd06..41aa6a45 100644
--- a/auth/docker/dstart.sh
+++ b/auth/docker/dstart.sh
@@ -1,9 +1,6 @@
#!/bin/bash dstop.sh
-ORG=onap
-PROJECT=aaf
-DOCKER_REPOSITORY=nexus3.onap.org:10003
-VERSION=2.1.0-SNAPSHOT
-./d.props
+# Pull in Props
+. ./d.props
if [ "$1" == "" ]; then
AAF_COMPONENTS=`ls -r ../aaf_${VERSION}/bin | grep -v '\.'`
diff --git a/auth/docker/dstop.sh b/auth/docker/dstop.sh
index 6105a00b..58ac0bf7 100644
--- a/auth/docker/dstop.sh
+++ b/auth/docker/dstop.sh
@@ -1,8 +1,5 @@
#!/bin/bash dstop.sh
-ORG=onap
-PROJECT=aaf
-DOCKER_REPOSITORY=nexus3.onap.org:10003
-VERSION=2.1.0-SNAPSHOT
+# Pull in Properties
. ./d.props
if [ "$1" == "" ]; then