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

Update scriptests/test-versions to work with daemon args, and move docker version constants into tests-versions.

Browse source 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
Daniel Nephin 2015-08-31 17:29:25 -04:00 • committed by Daniel Nephin
commit 9978c3ea52
3 changed files with 26 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Dockerfile
View file

@ -66,17 +66,6 @@ RUN set -ex; \
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV ALL_DOCKER_VERSIONS 1.7.1 1.8.2-rc1
RUN set -ex; \
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; \
curl https://test.docker.com/builds/Linux/x86_64/docker-1.8.2-rc1 -o /usr/local/bin/docker-1.8.2-rc1; \
chmod +x /usr/local/bin/docker-1.8.2-rc1
# Set the default Docker to be run
RUN ln -s /usr/local/bin/docker-1.7.1 /usr/local/bin/docker
RUN useradd -d /home/user -m -s /bin/bash user
WORKDIR /code/