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

Commit

Permalink
Bumps for 1.13.0
Browse files Browse the repository at this point in the history
Signed-off-by: Nathan LeClaire <[email protected]>
  • Loading branch information
nathanleclaire committed Jan 19, 2017
1 parent 2a751ca commit 6285253
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions Dockerfile.osx
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@ RUN curl -fsSL https://github.com/mackyle/xar/archive/xar-1.6.1.tar.gz | tar xvz
./autogen.sh && ./configure && \
make && make install

ENV VBOX_VERSION 5.1.12
ENV VBOX_REV 112440
ENV VBOX_VERSION 5.1.14
ENV VBOX_REV 112924

RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VirtualBox-$VBOX_VERSION-$VBOX_REV-OSX.dmg \
&& echo "$(curl -fsSL 'https://virtualbox.org/download/hashes/'"$VBOX_VERSION"'/SHA256SUMS' | awk '$2 ~ /-OSX.dmg$/ { print $1 }') */vbox.dmg" | sha256sum -c -

# Download the Docker parts

ENV INSTALLER_VERSION 1.13.0-rc7
ENV DOCKER_VERSION 1.13.0-rc7
ENV INSTALLER_VERSION 1.13.0
ENV DOCKER_VERSION 1.13.0

# Change this to 'test.docker.com' for RCs and 'get.docker.com' for official
# releases.
ENV DOCKER_ENDPOINT test.docker.com
ENV DOCKER_ENDPOINT get.docker.com

# 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 @@ -44,19 +44,19 @@ RUN curl -fsSL -o dockerbins.tgz "https://${DOCKER_ENDPOINT}/builds/Darwin/x86_6
RUN chmod +x /docker


ENV DOCKER_MACHINE_VERSION 0.9.0-rc2
ENV DOCKER_MACHINE_VERSION 0.9.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.10.0-rc2
ENV DOCKER_COMPOSE_VERSION 1.10.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

ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
RUN curl -fsSL -o /boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v$DOCKER_VERSION/boot2docker.iso

ENV KITEMATIC_VERSION 0.13.0-RC3
ENV KITEMATIC_VERSION 0.13.0
RUN curl -fsSL -o /kitematic.zip https://github.com/kitematic/kitematic/releases/download/v$KITEMATIC_VERSION/Kitematic-$KITEMATIC_VERSION-Mac.zip

ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e
Expand Down
16 changes: 8 additions & 8 deletions Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ RUN cd innosetup && \
wine "./innounp.exe" -e "is-unicode.exe"

# installer components
ENV INSTALLER_VERSION 1.13.0-rc7
ENV DOCKER_VERSION 1.13.0-rc7
ENV DOCKER_MACHINE_VERSION 0.9.0-rc2
ENV DOCKER_COMPOSE_VERSION 1.10.0-rc2
ENV INSTALLER_VERSION 1.13.0
ENV DOCKER_VERSION 1.13.0
ENV DOCKER_MACHINE_VERSION 0.9.0
ENV DOCKER_COMPOSE_VERSION 1.10.0
ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
ENV KITEMATIC_VERSION 0.13.0-RC3
ENV VIRTUALBOX_VERSION 5.1.12
ENV VIRTUALBOX_REVISION 112440
ENV KITEMATIC_VERSION 0.13.0
ENV VIRTUALBOX_VERSION 5.1.14
ENV VIRTUALBOX_REVISION 112924
ENV GIT_VERSION 2.9.0
ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e

Expand All @@ -34,7 +34,7 @@ WORKDIR /bundle

# Change this to 'test.docker.com' for RCs and 'get.docker.com' for official
# releases.
ENV DOCKER_ENDPOINT test.docker.com
ENV DOCKER_ENDPOINT get.docker.com

RUN curl -fsSL -o dockerbins.zip "https://${DOCKER_ENDPOINT}/builds/Windows/x86_64/docker-${DOCKER_VERSION}.zip" && \
unzip dockerbins.zip && \
Expand Down

0 comments on commit 6285253

Please sign in to comment.