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

Revert "Use dev version of Docker" 

This reverts commit d209ded13c.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2015-03-23 14:41:53 -07:00
parent 965426e39b
commit 16495c577b
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Dockerfile
View File

@ -15,18 +15,13 @@ RUN set -ex; \
; \ ; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# ENV ALL_DOCKER_VERSIONS 1.6.0 ENV ALL_DOCKER_VERSIONS 1.3.3 1.4.1 1.5.0
# RUN set -ex; \ RUN set -ex; \
# for v in ${ALL_DOCKER_VERSIONS}; do \ for v in ${ALL_DOCKER_VERSIONS}; do \
# curl https://get.docker.com/builds/Linux/x86_64/docker-$v -o /usr/local/bin/docker-$v; \ curl https://get.docker.com/builds/Linux/x86_64/docker-$v -o /usr/local/bin/docker-$v; \
# chmod +x /usr/local/bin/docker-$v; \ chmod +x /usr/local/bin/docker-$v; \
# done 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 RUN useradd -d /home/user -m -s /bin/bash user
WORKDIR /code/ WORKDIR /code/

4
script/test-versions
View File

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