tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-13 16:54:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Test against Docker 1.6 RC2 only

Browse Source 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2015-03-31 16:04:22 -04:00
parent 6dbe321a45
commit 0650c4485a
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -15,18 +15,14 @@ RUN set -ex; \
; \ ; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ENV ALL_DOCKER_VERSIONS 1.3.3 1.4.1 1.5.0 1.6.0-rc2 ENV ALL_DOCKER_VERSIONS 1.6.0-rc2
RUN set -ex; \ RUN set -ex; \
for v in 1.3.3 1.4.1 1.5.0; do \
curl https://get.docker.com/builds/Linux/x86_64/docker-$v -o /usr/local/bin/docker-$v; \
chmod +x /usr/local/bin/docker-$v; \
done; \
curl https://test.docker.com/builds/Linux/x86_64/docker-1.6.0-rc2 -o /usr/local/bin/docker-1.6.0-rc2; \ curl https://test.docker.com/builds/Linux/x86_64/docker-1.6.0-rc2 -o /usr/local/bin/docker-1.6.0-rc2; \
chmod +x /usr/local/bin/docker-1.6.0-rc2 chmod +x /usr/local/bin/docker-1.6.0-rc2
# Set the default Docker to be run # Set the default Docker to be run
RUN ln -s /usr/local/bin/docker-1.3.3 /usr/local/bin/docker RUN ln -s /usr/local/bin/docker-1.6.0-rc2 /usr/local/bin/docker
RUN useradd -d /home/user -m -s /bin/bash user RUN useradd -d /home/user -m -s /bin/bash user
WORKDIR /code/ WORKDIR /code/

2
script/test-versions
View File

@ -8,7 +8,7 @@ set -e
flake8 compose tests setup.py flake8 compose tests setup.py
if [ "$DOCKER_VERSIONS" == "" ]; then if [ "$DOCKER_VERSIONS" == "" ]; then
DOCKER_VERSIONS="1.5.0" DOCKER_VERSIONS="default"
elif [ "$DOCKER_VERSIONS" == "all" ]; then elif [ "$DOCKER_VERSIONS" == "all" ]; then
DOCKER_VERSIONS="$ALL_DOCKER_VERSIONS" DOCKER_VERSIONS="$ALL_DOCKER_VERSIONS"
fi fi

6
script/wrapdocker
View File

@ -1,10 +1,8 @@
#!/bin/bash #!/bin/bash
if [ "$DOCKER_VERSION" == "" ]; then if [ "$DOCKER_VERSION" != "" ] && [ "$DOCKER_VERSION" != "default" ]; then
DOCKER_VERSION="1.5.0"
fi
ln -fs "/usr/local/bin/docker-$DOCKER_VERSION" "/usr/local/bin/docker" ln -fs "/usr/local/bin/docker-$DOCKER_VERSION" "/usr/local/bin/docker"
fi
# If a pidfile is still around (for example after a container restart), # If a pidfile is still around (for example after a container restart),
# delete it so that docker can start. # delete it so that docker can start.