diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2018-03-29 14:32:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-29 14:32:09 +0000 |
| commit | fab98e0304ed5e7bf07404682f65f594299fb030 (patch) | |
| tree | 6068cc7dff1f7032df9e98359c6c5f8e61ddf3ef | |
| parent | 9c002802128c1227e2dfd7f4a4a9530585a80d2d (diff) | |
| parent | d234bad707d39d442a64ae3f3c10c082b9bc2b16 (diff) | |
Merge "Update docker tag convention"
| -rwxr-xr-x | docker_build.sh | 4 | ||||
| -rwxr-xr-x | docker_merge.sh | 4 | ||||
| -rwxr-xr-x | 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 |