Use CLI source from the docker-ce repo

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

Author: shin-

Dockerfile.windows

@@ -13,11 +13,6 @@ ARG VBOX_VERSION
 ARG VBOX_REV
 ARG MIXPANEL_TOKEN
 
-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
-
 RUN dpkg --add-architecture i386
 RUN sed -i "s/main/main contrib non-free/" /etc/apt/sources.list
 RUN apt-get update && apt-get install -yq wine curl unrar unzip
@@ -34,6 +29,18 @@ RUN cd /innosetup && \
 
 ENV GIT_VERSION 2.9.0
 
+# Build CLI binary
+RUN mkdir -p /go/src/github.com/docker/
+
+RUN git clone https://github.com/docker/docker-ce.git /docker-ce && \
+    cd /docker-ce && \
+    git checkout $DOCKER_CLI_COMMIT && \
+    cp -R components/cli /go/src/github.com/docker/
+
+WORKDIR /go/src/github.com/docker/cli
+RUN VERSION=$DOCKER_VERSION GITCOMMIT=$(echo $DOCKER_CLI_COMMIT | cut -c 1-7) ./scripts/build/windows
+
+# Assemble bundle
 RUN mkdir /bundle
 
 WORKDIR /bundle

versions

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