jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Use dev version of Docker"

Browse source 
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
commit 16495c577b
2 changed files with 8 additions and 13 deletions
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/*
# ENV ALL_DOCKER_VERSIONS 1.6.0
ENV ALL_DOCKER_VERSIONS 1.3.3 1.4.1 1.5.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
# 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 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 useradd -d /home/user -m -s /bin/bash user
WORKDIR /code/