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

Commit

Permalink
Fix get.docker.com not working for RCs
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 Sep 28, 2016
1 parent b497900 commit dce5e4d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
6 changes: 5 additions & 1 deletion Dockerfile.osx
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,15 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS
ENV INSTALLER_VERSION 1.12.2-rc1
ENV DOCKER_VERSION 1.12.2-rc1

# Change this to 'test.docker.com' for RCs and 'get.docker.com' for official
# releases.
ENV DOCKER_ENDPOINT test.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
# 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://get.docker.com/builds/Darwin/x86_64/docker-${DOCKER_VERSION}.tgz" && \
RUN curl -fsSL -o dockerbins.tgz "https://${DOCKER_ENDPOINT}/builds/Darwin/x86_64/docker-${DOCKER_VERSION}.tgz" && \
tar xvf dockerbins.tgz docker/docker --strip-components 1 && \
rm dockerbins.tgz

Expand Down
6 changes: 5 additions & 1 deletion Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ RUN mkdir /bundle

WORKDIR /bundle

RUN curl -fsSL -o dockerbins.zip "https://get.docker.com/builds/Windows/x86_64/docker-${DOCKER_VERSION}.zip" && \
# Change this to 'test.docker.com' for RCs and 'get.docker.com' for official
# releases.
ENV DOCKER_ENDPOINT test.docker.com

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

0 comments on commit dce5e4d

Please sign in to comment.