mirror of
https://github.com/docker/compose.git
synced 2025-07-21 20:54:32 +02:00
Merge pull request #1832 from aanand/use-docker-1.8.0-rc3
Test against Docker 1.8.0 RC3 (cherry picked from commit afc9629c59117ab2ae050b91d1e732234591b47f) Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
parent
74b4fb89bb
commit
7850d6de45
@ -48,11 +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.7.1
|
ENV ALL_DOCKER_VERSIONS 1.7.1 1.8.0-rc3
|
||||||
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
curl https://get.docker.com/builds/Linux/x86_64/docker-1.7.1 -o /usr/local/bin/docker-1.7.1; \
|
curl https://get.docker.com/builds/Linux/x86_64/docker-1.7.1 -o /usr/local/bin/docker-1.7.1; \
|
||||||
chmod +x /usr/local/bin/docker-1.7.1
|
chmod +x /usr/local/bin/docker-1.7.1; \
|
||||||
|
curl https://test.docker.com/builds/Linux/x86_64/docker-1.8.0-rc3 -o /usr/local/bin/docker-1.8.0-rc3; \
|
||||||
|
chmod +x /usr/local/bin/docker-1.8.0-rc3
|
||||||
|
|
||||||
# Set the default Docker to be run
|
# Set the default Docker to be run
|
||||||
RUN ln -s /usr/local/bin/docker-1.7.1 /usr/local/bin/docker
|
RUN ln -s /usr/local/bin/docker-1.7.1 /usr/local/bin/docker
|
||||||
|
Loading…
x
Reference in New Issue
Block a user