Merge pull request #1551 from aanand/use-docker-1.7-rc3

Use Docker 1.7 RC3
This commit is contained in:
Daniel Nephin 2015-06-15 21:33:07 -04:00
commit f3df2a9fec
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 -rf pip-7.0.1; \
rm pip-7.0.1.tar.gz rm pip-7.0.1.tar.gz
ENV ALL_DOCKER_VERSIONS 1.6.0 1.7.0-rc2 ENV ALL_DOCKER_VERSIONS 1.6.0 1.7.0-rc3
RUN set -ex; \ RUN set -ex; \
curl https://get.docker.com/builds/Linux/x86_64/docker-1.6.0 -o /usr/local/bin/docker-1.6.0; \ 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; \ chmod +x /usr/local/bin/docker-1.6.0; \
curl https://test.docker.com/builds/Linux/x86_64/docker-1.7.0-rc2 -o /usr/local/bin/docker-1.7.0-rc2; \ 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-rc2 chmod +x /usr/local/bin/docker-1.7.0-rc3
# Set the default Docker to be run # Set the default Docker to be run
RUN ln -s /usr/local/bin/docker-1.6.0 /usr/local/bin/docker RUN ln -s /usr/local/bin/docker-1.6.0 /usr/local/bin/docker