From b85687d4ecf7a4c004e9c943d895992f0aedb116 Mon Sep 17 00:00:00 2001
From: Sai Gandham <sg481n@att.com>
Date: Tue, 5 Jun 2018 21:19:43 +0000
Subject: Release docker version & update manifest

Issue-ID: AAF-349
Change-Id: Ie548ca0706d5e2d35657221283f5898ca72dd26d
Signed-off-by: Sai Gandham <sg481n@att.com>
---
 auth/docker/d.props   | 3 +--
 auth/docker/dbuild.sh | 2 +-
 auth/docker/dpush.sh  | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/auth/docker/d.props b/auth/docker/d.props
index 8c7b736a..e56d4597 100644
--- a/auth/docker/d.props
+++ b/auth/docker/d.props
@@ -3,8 +3,7 @@ ORG=onap
 PROJECT=aaf
 DOCKER_REPOSITORY=nexus3.onap.org:10003
 OLD_VERSION=2.1.0-SNAPSHOT
-VERSION_2.1.0=2.1.0
-VERSION_2.1.1=2.1.1
+NEW_VERSION=2.1.1
 VERSION=2.1.1-SNAPSHOT
 CONF_ROOT_DIR=/opt/app/osaaf
 
diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh
index 27de097f..ce299171 100755
--- a/auth/docker/dbuild.sh
+++ b/auth/docker/dbuild.sh
@@ -18,7 +18,7 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
         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}:${VERSION_2.1.1}
+		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 c110f43d..78129796 100644
--- a/auth/docker/dpush.sh
+++ b/auth/docker/dpush.sh
@@ -13,6 +13,6 @@ fi
 for AAF_COMPONENT in ${AAF_COMPONENTS}; do
         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}:${VERSION_2.1.1}
+		docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${NEW_VERSION}
 
 done
-- 
cgit 1.2.3-korg