From 96e61f3173c21a94f06db2bf1f8a6041da3e4e21 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 20 Jun 2017 17:04:30 -0400
Subject: [PATCH] Remove bindata

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 Dockerfile                          |  3 ---
 hack/dockerfile/binaries-commits    |  1 -
 hack/dockerfile/install-binaries.sh | 14 +-------------
 hack/make.ps1                       |  2 +-
 hack/validate/gofmt                 |  3 +--
 hack/validate/lint                  |  2 +-
 6 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ea68f45916..a1e7a2a691 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -201,9 +201,6 @@ RUN ln -sfv $PWD/.bashrc ~/.bashrc
 # Add integration helps to bashrc
 RUN echo "source $PWD/hack/make/.integration-test-helpers" >> /etc/bash.bashrc
 
-# Register Docker's bash completion.
-RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker
-
 # Get useful and necessary Hub images so we can "docker load" locally instead of pulling
 COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/
 RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
diff --git a/hack/dockerfile/binaries-commits b/hack/dockerfile/binaries-commits
index 9991736fe3..98344bc2fa 100644
--- a/hack/dockerfile/binaries-commits
+++ b/hack/dockerfile/binaries-commits
@@ -8,7 +8,6 @@ CONTAINERD_COMMIT=3addd840653146c90a254301d6c3a663c7fd6429
 TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
 LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
 VNDR_COMMIT=c56e082291115e369f77601f9c071dd0b87c7120
-BINDATA_COMMIT=a0ff2567cfb70903282db057e799fd826784d41d
 
 # CLI
 DOCKERCLI_REPO=https://github.com/docker/cli
diff --git a/hack/dockerfile/install-binaries.sh b/hack/dockerfile/install-binaries.sh
index 2bfe06d829..370ec7ce45 100755
--- a/hack/dockerfile/install-binaries.sh
+++ b/hack/dockerfile/install-binaries.sh
@@ -46,14 +46,6 @@ install_proxy() {
 	go build -ldflags="$PROXY_LDFLAGS" -o /usr/local/bin/docker-proxy github.com/docker/libnetwork/cmd/proxy
 }
 
-install_bindata() {
-    echo "Install go-bindata version $BINDATA_COMMIT"
-    git clone https://github.com/jteeuwen/go-bindata "$GOPATH/src/github.com/jteeuwen/go-bindata"
-    cd $GOPATH/src/github.com/jteeuwen/go-bindata
-    git checkout -q "$BINDATA_COMMIT"
-	go build -o /usr/local/bin/go-bindata github.com/jteeuwen/go-bindata/go-bindata
-}
-
 install_dockercli() {
 	echo "Install docker/cli version $DOCKERCLI_COMMIT"
 	git clone "$DOCKERCLI_REPO" "$GOPATH/src/github.com/docker/cli"
@@ -117,16 +109,12 @@ do
 			go build -v -o /usr/local/bin/vndr .
 			;;
 
-		bindata)
-			install_bindata
-			;;
-
 		dockercli)
 			install_dockercli
 			;;
 
 		*)
-			echo echo "Usage: $0 [tomlv|runc|runc-dynamic|containerd|containerd-dynamic|tini|proxy|proxy-dynamic|bindata|vndr|dockercli]"
+			echo echo "Usage: $0 [tomlv|runc|runc-dynamic|containerd|containerd-dynamic|tini|proxy|proxy-dynamic|vndr|dockercli]"
 			exit 1
 
 	esac
diff --git a/hack/make.ps1 b/hack/make.ps1
index 8ef9ab6ead..c1cdad37ee 100644
--- a/hack/make.ps1
+++ b/hack/make.ps1
@@ -280,7 +280,7 @@ Function Validate-GoFormat($headCommit, $upstreamCommit) {
 
     # Get a list of all go source-code files which have changed.  Ignore exit code on next call - always process regardless
     $files=@(); $files = Invoke-Expression "git diff $upstreamCommit...$headCommit --diff-filter=ACMR --name-only -- `'*.go`'"
-    $files = $files | Select-String -NotMatch "^vendor/" | Select-String -NotMatch "^cli/compose/schema/bindata.go"
+    $files = $files | Select-String -NotMatch "^vendor/"
     $badFiles=@(); $files | %{
         # Deliberately ignore error on next line - treat as failed
         $content=Invoke-Expression "git show $headCommit`:$_"
diff --git a/hack/validate/gofmt b/hack/validate/gofmt
index 42ba052b74..f70d574fbf 100755
--- a/hack/validate/gofmt
+++ b/hack/validate/gofmt
@@ -5,8 +5,7 @@ source "${SCRIPTDIR}/.validate"
 
 IFS=$'\n'
 files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' |
-    grep -v '^vendor/' |
-    grep -v '^cli/compose/schema/bindata.go' || true) )
+    grep -v '^vendor/' || true) )
 unset IFS
 
 badFiles=()
diff --git a/hack/validate/lint b/hack/validate/lint
index d362f46243..85f7f1abe6 100755
--- a/hack/validate/lint
+++ b/hack/validate/lint
@@ -4,7 +4,7 @@ export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "${SCRIPTDIR}/.validate"
 
 IFS=$'\n'
-files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' | grep -v '^api/types/container/' | grep -v '^cli/compose/schema/bindata.go' | grep -v '^api/types/plugins/logdriver/entry.pb.go' || true) )
+files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' | grep -v '^api/types/container/' | grep -v '^api/types/plugins/logdriver/entry.pb.go' || true) )
 unset IFS
 
 errors=()