diff options
Diffstat (limited to 'auth/docker')
| -rw-r--r-- | auth/docker/Dockerfile | 5 | ||||
| -rw-r--r-- | auth/docker/d.props | 2 | ||||
| -rw-r--r-- | auth/docker/dbuild.sh | 2 | ||||
| -rw-r--r-- | auth/docker/dclean.sh | 6 | ||||
| -rw-r--r-- | auth/docker/drun.sh | 5 | ||||
| -rw-r--r-- | auth/docker/dstart.sh | 6 | ||||
| -rw-r--r-- | auth/docker/dstop.sh | 6 |
7 files changed, 22 insertions, 10 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 501530db..23fa72f5 100644 --- a/auth/docker/dbuild.sh +++ b/auth/docker/dbuild.sh @@ -3,7 +3,7 @@ # Docker Building Script. Reads all the components generated by install, on per-version basis # # Pull in Variables from d.props -./d.props +. ./d.props # TODO add ability to do DEBUG settings if ["$1" == ""]; then diff --git a/auth/docker/dclean.sh b/auth/docker/dclean.sh index b14f0bcc..4c2dd3bf 100644 --- a/auth/docker/dclean.sh +++ b/auth/docker/dclean.sh @@ -1,5 +1,9 @@ #!/bin/bash dclean.sh -. d.props +ORG=onap +PROJECT=aaf +DOCKER_REPOSITORY=nexus3.onap.org:10003 +VERSION=2.1.0-SNAPSHOT +./d.props if [ "$1" == "" ]; then AAF_COMPONENTS=`ls ../aaf_${VERSION}/bin | grep -v '\.'` diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh index 80414ea4..2b5f709a 100644 --- a/auth/docker/drun.sh +++ b/auth/docker/drun.sh @@ -1,5 +1,6 @@ #!/bin/bash drun.sh -. d.props +. ./d.props + if [ "$1" == "" ]; then AAF_COMPONENTS=`ls -r ../aaf_${VERSION}/bin | grep -v '\.'` @@ -47,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 diff --git a/auth/docker/dstart.sh b/auth/docker/dstart.sh index 9fcc328b..ac8ffd06 100644 --- a/auth/docker/dstart.sh +++ b/auth/docker/dstart.sh @@ -1,5 +1,9 @@ #!/bin/bash dstop.sh -. d.props +ORG=onap +PROJECT=aaf +DOCKER_REPOSITORY=nexus3.onap.org:10003 +VERSION=2.1.0-SNAPSHOT +./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 78088423..6105a00b 100644 --- a/auth/docker/dstop.sh +++ b/auth/docker/dstop.sh @@ -1,5 +1,9 @@ #!/bin/bash dstop.sh -. d.props +ORG=onap +PROJECT=aaf +DOCKER_REPOSITORY=nexus3.onap.org:10003 +VERSION=2.1.0-SNAPSHOT +. ./d.props if [ "$1" == "" ]; then AAF_COMPONENTS=`ls ../aaf_${VERSION}/bin | grep -v '\.'` |