Adjust Docker Build 2

Issue-ID: AAF-723
Change-Id: I6e70768e4fcf879b5c375889ba454fa8960242c0
Signed-off-by: Instrumental <jonathan.gathman@att.com>

diff --git a/auth/docker/dpush.sh b/auth/docker/dpush.sh
index f9f674f..e99d14b 100644 (file)
--- a/auth/docker/dpush.sh
+++ b/auth/docker/dpush.sh
@@ -27,10 +27,10 @@ DOCKER=${DOCKER:=docker}
 AAF_COMPONENTS="config agent base core cass $(cat components) "
 
 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 tag ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_AAF_COMPONENT}:${VERSION}-latest
-        docker tag ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_AAF_COMPONENT}:latest
-               $DOCKER push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_AAF_COMPONENT}:${VERSION}-latest
-               $DOCKER push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_AAF_COMPONENT}:latest
+        # docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${OLD_VERSION}
+        $DOCKER push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}
+        docker tag ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}-latest
+        docker tag ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:latest
+               $DOCKER push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}-latest
+               $DOCKER push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:latest
 done