From a0ded132d71bb489e272d50e931c4a50b448c6a9 Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Mon, 2 Apr 2018 21:58:00 -0400 Subject: Fix docker tag Follow the docker tagging required by CIMAN. Issue-ID: DCAEGEN2-206 Change-Id: I013b2b33109e034bb329967198c8fd589c92ff92 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 d3c3f258..ac537223 100755 --- a/mvn-phase-lib.sh +++ b/mvn-phase-lib.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 a docker image docker build --rm -f ./Dockerfile -t "${LFQI}" ./ @@ -279,7 +279,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