tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use dev version of Docker 

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2015-03-19 11:21:58 -07:00
parent 49c2080bcd
commit d209ded13c
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Dockerfile
View File

@ -15,13 +15,18 @@ RUN set -ex; \
; \
rm -rf /var/lib/apt/lists/*
ENV ALL_DOCKER_VERSIONS 1.3.3 1.4.1 1.5.0
# ENV ALL_DOCKER_VERSIONS 1.6.0
RUN set -ex; \
for v in ${ALL_DOCKER_VERSIONS}; 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
# RUN set -ex; \
# for v in ${ALL_DOCKER_VERSIONS}; 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
# Temporarily use dev version of Docker
ENV ALL_DOCKER_VERSIONS dev
RUN curl https://master.dockerproject.com/linux/amd64/docker-1.5.0-dev > /usr/local/bin/docker-dev
RUN chmod +x /usr/local/bin/docker-dev
RUN useradd -d /home/user -m -s /bin/bash user
WORKDIR /code/

4
script/test-versions
View File

@ -11,14 +11,14 @@ script/validate-dco
flake8 compose
if [ "$DOCKER_VERSIONS" == "" ]; then
DOCKER_VERSIONS="1.5.0"
DOCKER_VERSIONS="dev"
elif [ "$DOCKER_VERSIONS" == "all" ]; then
DOCKER_VERSIONS="$ALL_DOCKER_VERSIONS"
fi
for version in $DOCKER_VERSIONS; do
>&2 echo "Running tests against Docker $version"
docker-1.5.0 run \
docker-$version run \
--rm \
--privileged \
--volume="/var/lib/docker" \