Merge pull request #1558 from aanand/use-docker-1.7-rc4

Use Docker 1.7 RC5
This commit is contained in:
Daniel Nephin 2015-06-16 22:01:50 -04:00
commit 26ea27172e
1 changed files with 3 additions and 3 deletions

View File

@ -48,13 +48,13 @@ RUN set -ex; \
rm -rf pip-7.0.1; \
rm pip-7.0.1.tar.gz
ENV ALL_DOCKER_VERSIONS 1.6.0 1.7.0-rc3
ENV ALL_DOCKER_VERSIONS 1.6.0 1.7.0-rc5
RUN set -ex; \
curl https://get.docker.com/builds/Linux/x86_64/docker-1.6.0 -o /usr/local/bin/docker-1.6.0; \
chmod +x /usr/local/bin/docker-1.6.0; \
curl https://test.docker.com/builds/Linux/x86_64/docker-1.7.0-rc3 -o /usr/local/bin/docker-1.7.0-rc3; \
chmod +x /usr/local/bin/docker-1.7.0-rc3
curl https://test.docker.com/builds/Linux/x86_64/docker-1.7.0-rc5 -o /usr/local/bin/docker-1.7.0-rc5; \
chmod +x /usr/local/bin/docker-1.7.0-rc5
# Set the default Docker to be run
RUN ln -s /usr/local/bin/docker-1.6.0 /usr/local/bin/docker