docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity

Bump Toolbox to Docker 1.10.2

Browse Source 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
This commit is contained in:
Nathan LeClaire
2016-02-22 15:51:55 -08:00
parent 9ace6eabc3
commit 2865b2a481
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile.osx
View File

@@ -26,10 +26,9 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS
# Download the Docker parts
ENV INSTALLER_VERSION 1.10.1a
ENV DOCKER_VERSION 1.10.1
RUN curl -fsSL -o /docker https://test.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION
# RUN curl -fsSL -o docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION
ENV INSTALLER_VERSION 1.10.2a
ENV DOCKER_VERSION 1.10.2
RUN curl -fsSL -o /docker https://get.docker.com/builds/Darwin/x87_64/docker-$DOCKER_VERSION
RUN chmod +x /docker

7
Dockerfile.windows
View File

@@ -17,8 +17,8 @@ RUN cd innosetup && \
wine "./innounp.exe" -e "is-unicode.exe"
# installer components
ENV INSTALLER_VERSION 1.10.1a
ENV DOCKER_VERSION 1.10.1
ENV INSTALLER_VERSION 1.10.2a
ENV DOCKER_VERSION 1.10.2
ENV DOCKER_MACHINE_VERSION 0.6.0
ENV DOCKER_COMPOSE_VERSION 1.6.0
ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
@@ -30,8 +30,7 @@ ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e
RUN mkdir /bundle
WORKDIR /bundle
# RUN curl -fsSL -o docker.exe "https://get.docker.com/builds/Windows/x86_64/docker-$DOCKER_VERSION.exe"
RUN curl -fsSL -o docker.exe "https://test.docker.com/builds/Windows/x86_64/docker-$DOCKER_VERSION.exe"
RUN curl -fsSL -o docker.exe "https://get.docker.com/builds/Windows/x86_64/docker-$DOCKER_VERSION.exe"
RUN curl -fsSL -o docker-machine.exe "https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine-Windows-x86_64.exe"