vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Support docker 1.12

Browse source 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
This commit is contained in:
Derek McGowan 2016-07-14 16:24:40 -07:00
parent 8f9abbd27f
commit 00a505bc42
No known key found for this signature in database
GPG key ID: F58C5D0A4405ACDB
4 changed files with 36 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
contrib/docker-integration/run_multiversion.sh
View file

@ -46,7 +46,6 @@ echo "Testing image $distimage with distribution version $distversion"
# These images are defined in golem.conf
time docker pull nginx:1.9
time docker pull golang:1.6
time docker pull registry:0.9.1
time docker pull dmcgowan/token-server:simple
time docker pull dmcgowan/token-server:oauth
time docker pull distribution/golem-runner:0.1-bats
@ -54,11 +53,13 @@ time docker pull distribution/golem-runner:0.1-bats
time docker pull docker:1.9.1-dind
time docker pull docker:1.10.3-dind
time docker pull docker:1.11.1-dind
time docker pull docker:1.12.0-rc3-dind
golem -cache $cachedir \
-i "golem-distribution:latest,$distimage,$distversion" \
-i "golem-dind:latest,docker:1.9.1-dind,1.9.1" \
-i "golem-dind:latest,docker:1.10.3-dind,1.10.3" \
-i "golem-dind:latest,docker:1.11.1-dind,1.11.1" \
-i "golem-dind:latest,docker:1.12.0-rc3-dind,1.12.0" \
$DIR