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

Commit

Permalink
Bump versions for 1.10.0-rc1
Browse files Browse the repository at this point in the history
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
  • Loading branch information
nathanleclaire committed Mar 24, 2016
1 parent 530061b commit 3c75e2a
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 10 deletions.
17 changes: 12 additions & 5 deletions Dockerfile.osx
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,26 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS

# Download the Docker parts

ENV INSTALLER_VERSION 1.10.3
ENV DOCKER_VERSION 1.10.3
RUN curl -fsSL -o /docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION
ENV INSTALLER_VERSION 1.11.0-rc1
ENV DOCKER_VERSION 1.11.0-rc1

# 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
# subdirectory (not what we want). So we use --strip-components to remove the
# `usr/local/bin` part and drop the bin in the current directory.
RUN curl -fsSL -o dockerbins.tgz "https://test.docker.com/builds/Darwin/x86_64/docker-1.11.0-rc1.tgz" && \
tar xvf dockerbins.tgz usr/local/bin/docker --strip-components 3 && \
rm dockerbins.tgz

RUN chmod +x /docker


ENV DOCKER_MACHINE_VERSION 0.6.0
ENV DOCKER_MACHINE_VERSION 0.7.0-rc1
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.6.2
ENV DOCKER_COMPOSE_VERSION 1.7.0-rc1
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
14 changes: 9 additions & 5 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.10.3
ENV DOCKER_VERSION 1.10.3
ENV DOCKER_MACHINE_VERSION 0.6.0
ENV DOCKER_COMPOSE_VERSION 1.6.2
ENV INSTALLER_VERSION 1.11.0-rc1
ENV DOCKER_VERSION 1.11.0-rc1
ENV DOCKER_MACHINE_VERSION 0.7.0-rc1
ENV DOCKER_COMPOSE_VERSION 1.7.0-rc1
ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
ENV KITEMATIC_VERSION 0.10.0
ENV VIRTUALBOX_VERSION 5.0.16
Expand All @@ -29,8 +29,12 @@ ENV GIT_VERSION 2.7.0
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 dockerbins.tgz "https://test.docker.com/builds/Windows/x86_64/docker-1.11.0-rc1.tgz" && \
tar xvf dockerbins.tgz usr/local/bin/docker.exe --strip-components 3 && \
rm dockerbins.tgz

RUN curl -fsSL -o docker-machine.exe "https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine-Windows-x86_64.exe"

Expand Down

0 comments on commit 3c75e2a

Please sign in to comment.