From 653eca543f6122788b65738919767f4225ec9358 Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Mon, 2 Apr 2018 22:39:26 -0400 Subject: Fix docker tag based on CIMAN-132 Issue-ID: DCAEGEN2-206 Change-Id: I9bdfc4f58e80b047d205edfa5001b533391e5f1c Signed-off-by: Lusheng Ji --- mvn-phase-lib.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mvn-phase-lib.sh b/mvn-phase-lib.sh index 6736048..9bb81cd 100755 --- a/mvn-phase-lib.sh +++ b/mvn-phase-lib.sh @@ -234,7 +234,7 @@ build_and_push_docker() VERSION="${MVN_PROJECT_VERSION//[^0-9.]/}" VERSION2=$(echo "$VERSION" | cut -f1-2 -d'.') - LFQI="${IMAGENAME}:${VERSION}-${TIMESTAMP}" + LFQI="${IMAGENAME}:${VERSION}-${TIMESTAMP}"Z BUILD_PATH="${WORKSPACE}" # build a docker image docker build --rm -f "${WORKSPACE}"/Dockerfile -t "${LFQI}" "${BUILD_PATH}" @@ -277,7 +277,7 @@ build_and_push_docker() fi OLDTAG="${LFQI}" - PUSHTAGS="${REPO}/${IMAGENAME}:${VERSION2}-${TIMESTAMP} ${REPO}/${IMAGENAME}:${VERSION2} ${REPO}/${IMAGENAME}:${VERSION2}-latest" + PUSHTAGS="${REPO}/${IMAGENAME}:${VERSION}-SNAPSHOT-${TIMESTAMP}Z ${REPO}/${IMAGENAME}:${VERSION} ${REPO}/${IMAGENAME}:latest" for NEWTAG in ${PUSHTAGS} do echo "tagging ${OLDTAG} to ${NEWTAG}" -- cgit 1.2.3-korg