Merge pull request #659 from shin-/bump-17.06.0-rc2

Bump 17.06.0-rc2

Author: FrenchBen

Dockerfile.osx

@@ -1,6 +1,6 @@
 FROM debian:jessie
 
-ARG DOCKER_ENDPOINT
+ARG DOCKER_RELEASE_STAGE
 ARG INSTALLER_VERSION
 ARG DOCKER_VERSION
 ARG DOCKER_COMPOSE_VERSION
@@ -36,7 +36,7 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS
 # 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://${DOCKER_ENDPOINT}/builds/Darwin/x86_64/docker-${DOCKER_VERSION}.tgz" && \
+RUN curl -fsSL -o dockerbins.tgz "https://download.docker.com/mac/static/${DOCKER_RELEASE_STAGE}/x86_64/docker-${DOCKER_VERSION}-x86_64.tgz" && \
     tar xvf dockerbins.tgz docker/docker --strip-components 1 && \
     rm dockerbins.tgz
 RUN chmod +x /docker

Dockerfile.windows

@@ -2,7 +2,7 @@ FROM debian:jessie
 
 ENV DEBIAN_FRONTEND noninteractive
 
-ARG DOCKER_ENDPOINT
+ARG DOCKER_RELEASE_STAGE
 ARG INSTALLER_VERSION
 ARG DOCKER_VERSION
 ARG DOCKER_COMPOSE_VERSION
@@ -32,7 +32,7 @@ RUN mkdir /bundle
 
 WORKDIR /bundle
 
-RUN curl -fsSL -o dockerbins.zip "https://${DOCKER_ENDPOINT}/builds/Windows/x86_64/docker-${DOCKER_VERSION}.zip" && \
+RUN curl -fsSL -o dockerbins.zip "https://download.docker.com/win/static/${DOCKER_RELEASE_STAGE}/x86_64/docker-${DOCKER_VERSION}-x86_64.zip" && \
     unzip dockerbins.zip && \
     mv docker/docker.exe . && \
     rm -r docker/ dockerbins.zip

script/build-osx

@@ -6,7 +6,7 @@ set -e
 docker build \
 	-t osx-installer \
 	-f Dockerfile.osx \
-	--build-arg DOCKER_ENDPOINT="${DOCKER_ENDPOINT}" \
+	--build-arg DOCKER_RELEASE_STAGE="${DOCKER_RELEASE_STAGE}" \
 	--build-arg INSTALLER_VERSION="${INSTALLER_VERSION}" \
 	--build-arg DOCKER_VERSION="${DOCKER_VERSION}" \
 	--build-arg DOCKER_COMPOSE_VERSION="${DOCKER_COMPOSE_VERSION}" \

script/build-windows

@@ -6,7 +6,7 @@ set -e
 docker build \
 	-t windows-installer \
 	-f Dockerfile.windows \
-	--build-arg DOCKER_ENDPOINT="${DOCKER_ENDPOINT}" \
+	--build-arg DOCKER_RELEASE_STAGE="${DOCKER_RELEASE_STAGE}" \
 	--build-arg INSTALLER_VERSION="${INSTALLER_VERSION}" \
 	--build-arg DOCKER_VERSION="${DOCKER_VERSION}" \
 	--build-arg DOCKER_COMPOSE_VERSION="${DOCKER_COMPOSE_VERSION}" \

versions

@@ -1,7 +1,7 @@
-DOCKER_ENDPOINT=test.docker.com
-INSTALLER_VERSION=17.06.0-ce-rc1
-DOCKER_VERSION=17.06.0-ce-rc1
-DOCKER_COMPOSE_VERSION=1.14.0-rc1
+DOCKER_RELEASE_STAGE=test
+INSTALLER_VERSION=17.06.0-ce-rc2
+DOCKER_VERSION=17.06.0-ce-rc2
+DOCKER_COMPOSE_VERSION=1.14.0-rc2
 DOCKER_MACHINE_VERSION=0.12.0
 KITEMATIC_VERSION=0.17.0
 VBOX_VERSION=5.1.22