aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormmis <michael.morris@ericsson.com>2018-03-29 09:37:45 +0100
committermmis <michael.morris@ericsson.com>2018-03-29 09:40:16 +0100
commitd7eac786188f36beed8e75e530d5531fa46e1a0d (patch)
treefbff43442ab38bc8a75fb617a0584549d0d92144
parente044eecc921760327edc5c4fc9a16cbb36923c27 (diff)
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>
-rw-r--r--docker_build.sh4
-rw-r--r--docker_merge.sh4
-rw-r--r--docker_verify.sh2
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