diff options
| -rwxr-xr-x | mvn-phase-script.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh index ae1fd65..bf6c4ed 100755 --- a/mvn-phase-script.sh +++ b/mvn-phase-script.sh @@ -138,12 +138,13 @@ run_tox_test() rm -rf ./venv-tox ./.tox virtualenv ./venv-tox source ./venv-tox/bin/activate - pip install --upgrade pip - pip install --upgrade tox argparse + pip install pip==9.0.3 + pip install --upgrade argparse + pip install tox==2.9.1 pip freeze tox deactivate - rm -rf ./venv-tox ./.tox + #rm -rf ./venv-tox ./.tox done } @@ -237,7 +238,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 +281,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}" |