From d7eac786188f36beed8e75e530d5531fa46e1a0d Mon Sep 17 00:00:00 2001
From: mmis <michael.morris@ericsson.com>
Date: Thu, 29 Mar 2018 09:37:45 +0100
Subject: [PATCH] Update docker tag convention

Update docker scripts to comply with ONAP docker standard tag format

$VERSION-STAGING-YYYYMMDDTHHMMSSZ

Issue-ID: CIMAN-132
Change-Id: I28e2aea5425c614bf86b0a6f0e8fa0892ec018c3
Signed-off-by: mmis <michael.morris@ericsson.com>
---
 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 55ee96457..aa0ac4776 100644
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -58,7 +58,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
 
@@ -92,7 +92,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 085a1ce0d..9312b480c 100644
--- a/docker_merge.sh
+++ b/docker_merge.sh
@@ -54,7 +54,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
 
@@ -81,7 +81,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 b5ac2aa82..b5acdd870 100644
--- a/docker_verify.sh
+++ b/docker_verify.sh
@@ -57,7 +57,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