From ddce1db0b9b2e8429e8ead46e3966abe7d92e1c9 Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Mon, 2 Apr 2018 22:32:15 -0400 Subject: Fix docker tag based on CIMAN-132 Issue-ID: DCAEGEN2-206 Change-Id: I9948181ab9037323d88bf1fbbf5a0ad7412c0493 Signed-off-by: Lusheng Ji --- mvn-phase-script.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh index ae1fd65..3190531 100755 --- a/mvn-phase-script.sh +++ b/mvn-phase-script.sh @@ -237,7 +237,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}" @@ -280,7 +280,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