From d234bad707d39d442a64ae3f3c10c082b9bc2b16 Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Wed, 21 Mar 2018 10:38:42 -0700
Subject: [PATCH] Update docker tag convention

Update docker tagging script used by daily
release builds:

$VERSION-STAGING-YYYYMMDDTHHMMSSZ

Change-Id: Ib3207f175fd41a8e90664bb1a139d4e0a3fcf259
Issue-ID: CIMAN-132
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
---
 docker_build.sh  | 4 ++--
 docker_merge.sh  | 4 ++--
 docker_verify.sh | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker_build.sh b/docker_build.sh
index 9a83d6a5..020da467 100755
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -60,7 +60,7 @@ TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_MAJMIN_VERSION}-lat
 #
 # This has the nexus repo prepended and major/minor/patch version with timestamp
 #
-TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP}"
+TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP}Z"
 
 echo $TAGS
 
@@ -94,7 +94,7 @@ then
     exit 1
 
 fi
-docker push ${DOCKER_REPOSITORY}/onap/$IMAGE:${MVN_VERSION}-STAGING-${TIMESTAMP}
+docker push ${DOCKER_REPOSITORY}/onap/$IMAGE:${MVN_VERSION}-STAGING-${TIMESTAMP}Z
 
 if [ $? -ne 0 ]
 then
diff --git a/docker_merge.sh b/docker_merge.sh
index 72f15323..ec350f78 100755
--- a/docker_merge.sh
+++ b/docker_merge.sh
@@ -56,7 +56,7 @@ TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_MAJMIN_VERSION}-lat
 #
 # This has the nexus repo prepended and major/minor/patch version with timestamp
 #
-TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAMP}"
+TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAMP}Z"
 
 echo $TAGS
 
@@ -83,7 +83,7 @@ then
     exit 1
 fi
 
-docker push ${DOCKER_REPOSITORY}/onap/$IMAGE:${MVN_VERSION}-${TIMESTAMP}
+docker push ${DOCKER_REPOSITORY}/onap/$IMAGE:${MVN_VERSION}-${TIMESTAMP}Z
 
 if [ $? -ne 0 ]
 then
diff --git a/docker_verify.sh b/docker_verify.sh
index a458873f..35863ebd 100755
--- a/docker_verify.sh
+++ b/docker_verify.sh
@@ -59,7 +59,7 @@ TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_MAJMIN_VERSION}-lat
 #
 # This has the nexus repo prepended and major/minor/patch version with timestamp
 #
-TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAMP}"
+TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAMP}Z"
 
 echo $TAGS
 
-- 
2.16.6