From 18b6c49d69b8264273150cd29b2bf0b57c54e2a8 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 8 Oct 2020 13:40:18 -0400 Subject: [PATCH 1/1] 16976: Use adjusted version tag to accomodate release candidate packages Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- build/run-build-docker-jobs-image.sh | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/build/run-build-docker-jobs-image.sh b/build/run-build-docker-jobs-image.sh index 9d7e3777cd..7ec82c4401 100755 --- a/build/run-build-docker-jobs-image.sh +++ b/build/run-build-docker-jobs-image.sh @@ -190,18 +190,6 @@ if docker --version |grep " 1\.[0-9]\." ; then FORCE=-f fi -if ! [[ -z "$version_tag" ]]; then - docker tag $FORCE arvados/jobs:$cwl_runner_version_tag arvados/jobs:"$version_tag" - ECODE=$? - - if [[ "$ECODE" != "0" ]]; then - EXITCODE=$(($EXITCODE + $ECODE)) - fi - - checkexit $ECODE "docker tag" - title "docker tag complete (`timer`)" -fi - title "uploading images" timer_reset @@ -213,11 +201,7 @@ else ## 20150526 nico -- *sometimes* dockerhub needs re-login ## even though credentials are already in .dockercfg docker login -u arvados - if ! [[ -z "$version_tag" ]]; then - docker_push arvados/jobs:"$version_tag" - else - docker_push arvados/jobs:$cwl_runner_version_tag - fi + docker_push arvados/jobs:$cwl_runner_version_tag title "upload arvados images finished (`timer`)" else title "upload arvados images SKIPPED because no --upload option set (`timer`)" -- 2.30.2