From bffca0b271bfef833ac1dc71e26c668bdb70087a Mon Sep 17 00:00:00 2001
From: Tonis Tiigi <tonistiigi@gmail.com>
Date: Mon, 6 May 2019 16:11:39 -0700
Subject: [PATCH] dockerfile: unfork cli

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
---
 Dockerfile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 23b714e4..5834737d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,15 +32,15 @@ RUN --mount=target=. --mount=target=/root/.cache,type=cache \
 FROM buildx-build AS integration-tests
 COPY . .
 
-FROM golang:1.12-alpine AS docker-cli-build
-RUN apk add -U git bash coreutils gcc musl-dev
-ENV CGO_ENABLED=0
-ARG REPO=github.com/tiborvass/cli
-ARG BRANCH=cli-plugin-aliases
-ARG CLI_VERSION
-WORKDIR /go/src/github.com/docker/cli
-RUN git clone git://$REPO . && git checkout $BRANCH
-RUN ./scripts/build/binary
+# FROM golang:1.12-alpine AS docker-cli-build
+# RUN apk add -U git bash coreutils gcc musl-dev
+# ENV CGO_ENABLED=0
+# ARG REPO=github.com/tiborvass/cli
+# ARG BRANCH=cli-plugin-aliases
+# ARG CLI_VERSION
+# WORKDIR /go/src/github.com/docker/cli
+# RUN git clone git://$REPO . && git checkout $BRANCH
+# RUN ./scripts/build/binary
 
 FROM scratch AS binaries-unix
 COPY --from=buildx-build /usr/bin/buildx /
@@ -69,7 +69,7 @@ RUN mkdir -p /usr/local/lib/docker/cli-plugins && ln -s /usr/local/bin/buildx /u
 COPY ./hack/demo-env/entrypoint.sh /usr/local/bin
 COPY ./hack/demo-env/tmux.conf /root/.tmux.conf
 COPY --from=dockerd-release /usr/local/bin /usr/local/bin
-COPY --from=docker-cli-build /go/src/github.com/docker/cli/build/docker /usr/local/bin
+#COPY --from=docker-cli-build /go/src/github.com/docker/cli/build/docker /usr/local/bin
 
 WORKDIR /work
 COPY ./hack/demo-env/examples .