diff options
Diffstat (limited to 'auth/docker')
| -rw-r--r-- | auth/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | auth/docker/d.props | 4 | ||||
| -rwxr-xr-x | auth/docker/dbuild.sh | 2 | ||||
| -rw-r--r-- | auth/docker/dpush.sh | 4 |
4 files changed, 9 insertions, 3 deletions
diff --git a/auth/docker/Dockerfile b/auth/docker/Dockerfile index 609c26ed..d744d69c 100644 --- a/auth/docker/Dockerfile +++ b/auth/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM rmannfv/aaf-base:openjdk8 +FROM rmannfv/aaf-base:xenial MAINTAINER AAF Team, AT&T 2018 ENV VERSION=${AAF_VERSION} diff --git a/auth/docker/d.props b/auth/docker/d.props index 00624514..e56d4597 100644 --- a/auth/docker/d.props +++ b/auth/docker/d.props @@ -2,7 +2,9 @@ ORG=onap PROJECT=aaf DOCKER_REPOSITORY=nexus3.onap.org:10003 -VERSION=2.1.0-SNAPSHOT +OLD_VERSION=2.1.0-SNAPSHOT +NEW_VERSION=2.1.1 +VERSION=2.1.1-SNAPSHOT CONF_ROOT_DIR=/opt/app/osaaf # Local Env info diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh index ed99ec99..ce299171 100755 --- a/auth/docker/dbuild.sh +++ b/auth/docker/dbuild.sh @@ -17,6 +17,8 @@ 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} + docker tag ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${OLD_VERSION} + docker tag ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${NEW_VERSION} rm aaf_${VERSION}/Dockerfile cd - done diff --git a/auth/docker/dpush.sh b/auth/docker/dpush.sh index 3c1a28fc..78129796 100644 --- a/auth/docker/dpush.sh +++ b/auth/docker/dpush.sh @@ -11,6 +11,8 @@ else fi for AAF_COMPONENT in ${AAF_COMPONENTS}; do - docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} + docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${OLD_VERSION} + docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} + docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${NEW_VERSION} done |