diff options
author | Pamela Dragosh <pdragosh@research.att.com> | 2018-03-29 14:31:49 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-03-29 14:31:49 +0000 |
commit | ca3efc7d2ee9522f995adc55baa6fff3279bba70 (patch) | |
tree | 9ced9dc94f24157d8133a44a9fea2e76d0193bd6 | |
parent | 1682434a328dfc001c8041a5676b55312c6fca40 (diff) | |
parent | 43380df396e1af53c3f6a2f29c3f5b067f6585bf (diff) |
Merge "Update docker tag convention"
-rw-r--r-- | docker_build.sh | 4 | ||||
-rw-r--r-- | docker_merge.sh | 4 | ||||
-rw-r--r-- | docker_verify.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/docker_build.sh b/docker_build.sh index 1168a2a8..a7e79db6 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 bd2b99bc..2175d714 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 99043f62..2e2c7110 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 |