[ARVADOS] updated: 1.3.0-3289-g18b6c49d6
Git user
git at public.arvados.org
Thu Oct 8 17:40:48 UTC 2020
Summary of changes:
build/run-build-docker-jobs-image.sh | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
via 18b6c49d69b8264273150cd29b2bf0b57c54e2a8 (commit)
from 2af7b0336b2b92e38f6966b8bbc233c05704815d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 18b6c49d69b8264273150cd29b2bf0b57c54e2a8
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Thu Oct 8 13:40:18 2020 -0400
16976: Use adjusted version tag to accomodate release candidate packages
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/build/run-build-docker-jobs-image.sh b/build/run-build-docker-jobs-image.sh
index 9d7e3777c..7ec82c440 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`)"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list