Docker on CircleCI doesn't support muti-stage builds

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

Author: shin-

Dockerfile.windows

@@ -1,37 +1,34 @@
-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
+FROM dockercore/golang-cross:latest
 
 ENV DEBIAN_FRONTEND noninteractive
 
 ARG DOCKER_RELEASE_STAGE
 ARG INSTALLER_VERSION
 ARG DOCKER_VERSION
+ARG DOCKER_CLI_COMMIT
 ARG DOCKER_COMPOSE_VERSION
 ARG DOCKER_MACHINE_VERSION
 ARG KITEMATIC_VERSION
 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 sed -i "s/main/main contrib non-free/" /etc/apt/sources.list
 RUN apt-get update && apt-get install -yq wine curl unrar unzip
 
 # innosetup
-RUN mkdir innosetup && \
-    cd innosetup && \
+RUN mkdir /innosetup && \
+    cd /innosetup && \
     curl -fsSL -o innounp045.rar "https://downloads.sourceforge.net/project/innounp/innounp/innounp%200.45/innounp045.rar?r=&ts=1439566551&use_mirror=skylineservers" && \
     unrar e innounp045.rar
 
-RUN cd innosetup && \
+RUN cd /innosetup && \
     curl -fsSL -o is-unicode.exe http://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe && \
     wine "./innounp.exe" -e "is-unicode.exe"
 
@@ -41,7 +38,7 @@ RUN mkdir /bundle
 
 WORKDIR /bundle
 
-COPY --from=cli_build /go/src/github.com/docker/cli/build/docker-windows-amd64 ./docker.exe
+RUN cp /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"