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

Commit

Permalink
Bump to 1.11.0-rc2
Browse files Browse the repository at this point in the history
Signed-off-by: Nathan LeClaire <[email protected]>
  • Loading branch information
nathanleclaire committed Mar 28, 2016
1 parent fcdf7c3 commit 5d6d325
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Dockerfile.osx
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS

# Download the Docker parts

ENV INSTALLER_VERSION 1.11.0-rc1
ENV DOCKER_VERSION 1.11.0-rc1
ENV INSTALLER_VERSION 1.11.0-rc2
ENV DOCKER_VERSION 1.11.0-rc2

# 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" && \
RUN curl -fsSL -o dockerbins.tgz "https://test.docker.com/builds/Darwin/x86_64/docker-${DOCKER_VERSION}.tgz" && \
tar xvf dockerbins.tgz usr/local/bin/docker --strip-components 3 && \
rm dockerbins.tgz

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

# installer components
ENV INSTALLER_VERSION 1.11.0-rc1
ENV DOCKER_VERSION 1.11.0-rc1
ENV INSTALLER_VERSION 1.11.0-rc2
ENV DOCKER_VERSION 1.11.0-rc2
ENV DOCKER_MACHINE_VERSION 0.7.0-rc1
ENV DOCKER_COMPOSE_VERSION 1.7.0-rc1
ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
Expand All @@ -32,7 +32,7 @@ RUN mkdir /bundle

WORKDIR /bundle

RUN curl -fsSL -o dockerbins.tgz "https://test.docker.com/builds/Windows/x86_64/docker-1.11.0-rc1.tgz" && \
RUN curl -fsSL -o dockerbins.tgz "https://test.docker.com/builds/Windows/x86_64/docker-${DOCKER_VERSION}.tgz" && \
tar xvf dockerbins.tgz usr/local/bin/docker.exe --strip-components 3 && \
rm dockerbins.tgz

Expand Down

0 comments on commit 5d6d325

Please sign in to comment.