Build Windows CLI ourselves because ??????????????????????????????????

... and a happy new year

Signed-off-by: Joffrey F <[email protected]>

Author: shin-

Dockerfile.windows

@@ -1,3 +1,12 @@
+FROM dockercore/golang-cross:latest as cli_build
+
+ARG DOCKER_VERSION
+ARG DOCKER_CLI_COMMIT
+RUN mkdir -p /go/src/github.com/docker/cli
+WORKDIR /go/src/github.com/docker/cli
+RUN git clone https://github.com/docker/cli.git . && git checkout $DOCKER_CLI_COMMIT
+RUN VERSION=$DOCKER_VERSION ./scripts/build/windows
+
 FROM debian:jessie
 
 ENV DEBIAN_FRONTEND noninteractive
@@ -32,10 +41,7 @@ RUN mkdir /bundle
 
 WORKDIR /bundle
 
-RUN curl -fsSL -o dockerbins.zip "https://download.docker.com/win/static/${DOCKER_RELEASE_STAGE}/x86_64/docker-${DOCKER_VERSION}.zip" && \
-    unzip dockerbins.zip && \
-    mv docker/docker.exe . && \
-    rm -r docker/ dockerbins.zip
+COPY --from=cli_build /go/src/github.com/docker/cli/build/docker-windows-amd64 ./docker.exe
 
 RUN curl -fsSL -o docker-machine.exe "https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine-Windows-x86_64.exe"
 

script/build-windows

@@ -9,6 +9,7 @@ docker build \
 	--build-arg DOCKER_RELEASE_STAGE="${DOCKER_RELEASE_STAGE}" \
 	--build-arg INSTALLER_VERSION="${INSTALLER_VERSION}" \
 	--build-arg DOCKER_VERSION="${DOCKER_VERSION}" \
+	--build-arg DOCKER_CLI_COMMIT="${DOCKER_CLI_COMMIT}" \
 	--build-arg DOCKER_COMPOSE_VERSION="${DOCKER_COMPOSE_VERSION}" \
 	--build-arg DOCKER_MACHINE_VERSION="${DOCKER_MACHINE_VERSION}" \
 	--build-arg KITEMATIC_VERSION="${KITEMATIC_VERSION}" \

versions

@@ -1,6 +1,7 @@
 DOCKER_RELEASE_STAGE=stable
 INSTALLER_VERSION=17.12.0-ce
 DOCKER_VERSION=17.12.0-ce
+DOCKER_CLI_COMMIT=ace5417954ec908d862d59e992c8d77685366eab
 DOCKER_COMPOSE_VERSION=1.18.0
 DOCKER_MACHINE_VERSION=0.13.0
 KITEMATIC_VERSION=0.17.2