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

Merge pull request #542 from docker/bump_1.12.0

Browse Source 
Bump versions for 1.12.0
This commit is contained in:
Nathan LeClaire
2016-07-28 17:40:40 -07:00
committed by GitHub
parent ad9eac89e9 4359eee68a
commit 8adfe0ee4e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile.osx
View File

@@ -26,8 +26,8 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS
# Download the Docker parts
ENV INSTALLER_VERSION 1.12.0-rc4
ENV DOCKER_VERSION 1.12.0-rc4
ENV INSTALLER_VERSION 1.12.0
ENV DOCKER_VERSION 1.12.0
# Why '--strip-components 3'? The client binary is in usr/local/bin/docker in
# the tar archive. If we extract directly, it will create a usr/local/bin
@@ -40,12 +40,12 @@ RUN curl -fsSL -o dockerbins.tgz "https://test.docker.com/builds/Darwin/x86_64/d
RUN chmod +x /docker
ENV DOCKER_MACHINE_VERSION 0.8.0-rc2
ENV DOCKER_MACHINE_VERSION 0.8.0
RUN curl -fsSL -o /docker-machine https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine-Darwin-x86_64
RUN chmod +x /docker-machine
ENV DOCKER_COMPOSE_VERSION 1.8.0-rc2
ENV DOCKER_COMPOSE_VERSION 1.8.0
RUN curl -fsSL -o /docker-compose https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Darwin-x86_64
RUN chmod +x /docker-compose

8
Dockerfile.windows
View File

@@ -17,10 +17,10 @@ RUN cd innosetup && \
wine "./innounp.exe" -e "is-unicode.exe"
# installer components
ENV INSTALLER_VERSION 1.12.0-rc4
ENV DOCKER_VERSION 1.12.0-rc4
ENV DOCKER_MACHINE_VERSION 0.8.0-rc2
ENV DOCKER_COMPOSE_VERSION 1.8.0-rc2
ENV INSTALLER_VERSION 1.12.0
ENV DOCKER_VERSION 1.12.0
ENV DOCKER_MACHINE_VERSION 0.8.0
ENV DOCKER_COMPOSE_VERSION 1.8.0
ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
ENV KITEMATIC_VERSION 0.12.0
ENV VIRTUALBOX_VERSION 5.0.24