From 6611834c15886ba06b13cec15fc87ca732f07e06 Mon Sep 17 00:00:00 2001 From: Sai Gandham Date: Wed, 4 Apr 2018 15:33:05 -0500 Subject: add docker push file to aaf repo Issue-ID: AAF-208 Change-Id: I0e2350b6c6f2bbaf4fa02c0879e52ce148046d4d Signed-off-by: Sai Gandham --- auth/auth-service/pom.xml | 1 + auth/docker/dbash | 1 - auth/docker/dbash.sh | 1 + auth/docker/dbuild | 22 ---------------------- auth/docker/dbuild.sh | 24 ++++++++++++++++++++++++ auth/docker/dpush.sh | 20 ++++++++++++++++++++ auth/docker/drun | 37 ------------------------------------- auth/docker/drun.sh | 37 +++++++++++++++++++++++++++++++++++++ 8 files changed, 83 insertions(+), 60 deletions(-) delete mode 100644 auth/docker/dbash create mode 100644 auth/docker/dbash.sh delete mode 100644 auth/docker/dbuild create mode 100644 auth/docker/dbuild.sh create mode 100644 auth/docker/dpush.sh delete mode 100644 auth/docker/drun create mode 100644 auth/docker/drun.sh diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index 4acec253..10e3e4e7 100644 --- a/auth/auth-service/pom.xml +++ b/auth/auth-service/pom.xml @@ -27,6 +27,7 @@ true + true 0.7.7.201606060606 3.2 diff --git a/auth/docker/dbash b/auth/docker/dbash deleted file mode 100644 index da166b5c..00000000 --- a/auth/docker/dbash +++ /dev/null @@ -1 +0,0 @@ -docker exec -it aaf bash \ No newline at end of file diff --git a/auth/docker/dbash.sh b/auth/docker/dbash.sh new file mode 100644 index 00000000..da166b5c --- /dev/null +++ b/auth/docker/dbash.sh @@ -0,0 +1 @@ +docker exec -it aaf bash \ No newline at end of file diff --git a/auth/docker/dbuild b/auth/docker/dbuild deleted file mode 100644 index 55f5abba..00000000 --- a/auth/docker/dbuild +++ /dev/null @@ -1,22 +0,0 @@ -# -# Docker Building Script. Reads all the components generated by install, on per-version basis -# - -VERSION=2.1.0-SNAPSHOT -# TODO add ability to do DEBUG settings - -if ["$1" == ""]; then - AAF_COMPONENTS=`ls ../aaf_*HOT/bin | grep -v '\.'` -else - AAF_COMPONENTS=$1 -fi - -for AAF_COMPONENT in ${AAF_COMPONENTS}; do - sed -e 's/${AAF_VERSION}/'${VERSION}'/g' -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' Dockerfile > ../aaf_${VERSION}/Dockerfile - cd .. - docker build -t onap/aaf/aaf_${AAF_COMPONENT}:${VERSION} aaf_${VERSION} - rm aaf_${VERSION}/Dockerfile - cd - -done - - diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh new file mode 100644 index 00000000..b97ef6ab --- /dev/null +++ b/auth/docker/dbuild.sh @@ -0,0 +1,24 @@ +# +# Docker Building 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 + +if ["$1" == ""]; then + AAF_COMPONENTS=`ls ../aaf_*HOT/bin | grep -v '\.'` +else + AAF_COMPONENTS=$1 +fi + +for AAF_COMPONENT in ${AAF_COMPONENTS}; do + sed -e 's/${AAF_VERSION}/'${VERSION}'/g' -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' Dockerfile > ../aaf_${VERSION}/Dockerfile + cd .. + docker build -t ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} aaf_${VERSION} + rm aaf_${VERSION}/Dockerfile + cd - +done + + diff --git a/auth/docker/dpush.sh b/auth/docker/dpush.sh new file mode 100644 index 00000000..a9a03875 --- /dev/null +++ b/auth/docker/dpush.sh @@ -0,0 +1,20 @@ +# +# 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 + +if ["$1" == ""]; then + AAF_COMPONENTS=`ls ../aaf_*HOT/bin | grep -v '\.'` +else + AAF_COMPONENTS=$1 +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 diff --git a/auth/docker/drun b/auth/docker/drun deleted file mode 100644 index 601feaf3..00000000 --- a/auth/docker/drun +++ /dev/null @@ -1,37 +0,0 @@ -HOSTNAME=meriadoc.mithril.sbc.com -HOST_IP=172.17.0.3 -CASS_HOST="cass.mithril.sbc.com:172.17.0.3" -VERSION=2.1.0-SNAPSHOT - -if [ "$1" == "" ]; then - AAF_COMPONENTS=`ls ../aaf_${VERSION}/bin | grep -v '\.'` -else - AAF_COMPONENTS=$1 -fi - -for AAF_COMPONENT in ${AAF_COMPONENTS}; do - - case "$AAF_COMPONENT" in - "service") PORTMAP="8100:8100";; - "locate") PORTMAP="443:8095";; - "oauth") PORTMAP="8140:8140";; - "gui") PORTMAP="8200:8200";; - "cm") PORTMAP="8150:8150";; - "hello") PORTMAP="8130:8130";; - "fs") PORTMAP="80:8096";; - esac - -# if [ "`docker container ls | grep aaf_$AAF_COMPONENT:$VERSION`" == "" ]; then - docker run \ - --name aaf_$AAF_COMPONENT \ - --hostname="$HOSTNAME" \ - --add-host="$CASS_HOST" \ - --publish $PORTMAP \ - --volume=/opt/app/osaaf/etc:/opt/app/osaaf/etc \ - --link aaf_cass:cassandra \ - aaf_$AAF_COMPONENT:$VERSION -# else - #echo docker container start -ia aaf_$AAF_COMPONENT -# fi -done -# --add-host="$HOSTNAME:$HOST_IP" \ diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh new file mode 100644 index 00000000..601feaf3 --- /dev/null +++ b/auth/docker/drun.sh @@ -0,0 +1,37 @@ +HOSTNAME=meriadoc.mithril.sbc.com +HOST_IP=172.17.0.3 +CASS_HOST="cass.mithril.sbc.com:172.17.0.3" +VERSION=2.1.0-SNAPSHOT + +if [ "$1" == "" ]; then + AAF_COMPONENTS=`ls ../aaf_${VERSION}/bin | grep -v '\.'` +else + AAF_COMPONENTS=$1 +fi + +for AAF_COMPONENT in ${AAF_COMPONENTS}; do + + case "$AAF_COMPONENT" in + "service") PORTMAP="8100:8100";; + "locate") PORTMAP="443:8095";; + "oauth") PORTMAP="8140:8140";; + "gui") PORTMAP="8200:8200";; + "cm") PORTMAP="8150:8150";; + "hello") PORTMAP="8130:8130";; + "fs") PORTMAP="80:8096";; + esac + +# if [ "`docker container ls | grep aaf_$AAF_COMPONENT:$VERSION`" == "" ]; then + docker run \ + --name aaf_$AAF_COMPONENT \ + --hostname="$HOSTNAME" \ + --add-host="$CASS_HOST" \ + --publish $PORTMAP \ + --volume=/opt/app/osaaf/etc:/opt/app/osaaf/etc \ + --link aaf_cass:cassandra \ + aaf_$AAF_COMPONENT:$VERSION +# else + #echo docker container start -ia aaf_$AAF_COMPONENT +# fi +done +# --add-host="$HOSTNAME:$HOST_IP" \ -- cgit 1.2.3-korg