diff options
| author | Daniel Nephin <dnephin@gmail.com> | 2015-08-31 17:29:25 -0400 |
|---|---|---|
| committer | Daniel Nephin <dnephin@docker.com> | 2015-09-17 17:35:49 -0400 |
| commit | 9978c3ea52edbc99f2e293e98c4db5196972d655 (patch) | |
| tree | 711e68a191f7765a555f66765b35858f621f226a /Dockerfile | |
| parent | eb20590ca66bb458504be60df7df948835a2eb45 (diff) | |
Update scriptests/test-versions to work with daemon args, and move docker version constants into tests-versions.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 11 |
1 files changed, 0 insertions, 11 deletions
@@ -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/ |