projects
/
arvados-dev.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1e7b6aa
b6a5513
)
Merge branch '6135-docker-git-tag'
author
Nico Cesar <nico@nicocesar.com>
Wed, 27 May 2015 14:16:55 +0000
(10:16 -0400)
committer
Nico Cesar <nico@nicocesar.com>
Wed, 27 May 2015 14:16:55 +0000
(10:16 -0400)
closes #6135
Conflicts:
jenkins/run-docker-tests.sh
1
2
jenkins/run-docker-tests.sh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
jenkins/run-docker-tests.sh
index f0afccb845b595cdcd8777d58af7c866801fdd6d,4f584d8979e0932f43b8ad89d0ef8d6d220c9cca..6bf3859d38e9762dc05776fcd66c7d29c5c5e750
---
1
/
jenkins/run-docker-tests.sh
---
2
/
jenkins/run-docker-tests.sh
+++ b/
jenkins/run-docker-tests.sh
@@@
-50,7
-64,16
+64,15
@@@
title ()
}
docker_push () {
- # Sometimes docker push fails; retry it a few times if necessary.
- echo $tags
+ if [[ ! -z "$tags" ]]
+ then
+ for tag in $( echo $tags|tr "," " " )
+ do
+ $DOCKER tag $1 $1:$tag
+ done
+ fi
+
+ # Sometimes docker push fails; retry it a few times if necessary.
for i in `seq 1 5`; do
$DOCKER push $*
ECODE=$?