Skip to content
This repository has been archived by the owner on Sep 26, 2021. It is now read-only.

Commit

Permalink
Merge pull request #542 from docker/bump_1.12.0
Browse files Browse the repository at this point in the history
Bump versions for 1.12.0
  • Loading branch information
nathanleclaire authored Jul 29, 2016
2 parents ad9eac8 + 4359eee commit 8adfe0e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Dockerfile.osx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8adfe0e

Please sign in to comment.