Merge pull request #1370 from aanand/update-docker-version

Update Docker version to 1.6 stable
This commit is contained in:
Daniel Nephin 2015-04-29 10:03:13 -04:00
commit de800dea0f
1 changed files with 4 additions and 4 deletions

View File

@ -15,14 +15,14 @@ RUN set -ex; \
; \ ; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ENV ALL_DOCKER_VERSIONS 1.6.0-rc4 ENV ALL_DOCKER_VERSIONS 1.6.0
RUN set -ex; \ RUN set -ex; \
curl https://test.docker.com/builds/Linux/x86_64/docker-1.6.0-rc4 -o /usr/local/bin/docker-1.6.0-rc4; \ curl https://get.docker.com/builds/Linux/x86_64/docker-1.6.0 -o /usr/local/bin/docker-1.6.0; \
chmod +x /usr/local/bin/docker-1.6.0-rc4 chmod +x /usr/local/bin/docker-1.6.0
# Set the default Docker to be run # Set the default Docker to be run
RUN ln -s /usr/local/bin/docker-1.6.0-rc4 /usr/local/bin/docker RUN ln -s /usr/local/bin/docker-1.6.0 /usr/local/bin/docker
RUN useradd -d /home/user -m -s /bin/bash user RUN useradd -d /home/user -m -s /bin/bash user
WORKDIR /code/ WORKDIR /code/