Merge pull request #27912 from LK4D4/vndr

project: use vndr for vendoring
Upstream-commit: c07234707878412eaaeab252af19adac8cf25d6b
Component: engine

components/engine/Dockerfile

@@ -130,7 +130,7 @@ RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd6
 	| tar -xzC /usr/local
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
-ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
+ENV GOPATH /go
 
 # Compile Go for cross compilation
 ENV DOCKER_CROSSPLATFORMS \
@@ -222,10 +222,10 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
 	hello-world:latest@sha256:8be990ef2aeb16dbcb9271ddfe2610fa6658d13f6dfb8bc72074cc1ca36966a7
 # See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
 
-# Install tomlv, runc, containerd, grimes, docker-proxy
+# Install tomlv, vndr, runc, containerd, grimes, docker-proxy
 # Please edit hack/dockerfile/install-binaries.sh to update them.
 COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
-RUN /tmp/install-binaries.sh tomlv runc containerd grimes proxy
+RUN /tmp/install-binaries.sh tomlv vndr runc containerd grimes proxy
 
 # Wrap all commands in the "docker-in-docker" script to allow nested containers
 ENTRYPOINT ["hack/dind"]

components/engine/Dockerfile.aarch64

@@ -101,7 +101,7 @@ RUN mkdir /usr/src/go && curl -fsSL https://storage.googleapis.com/golang/go${GO
 	&& GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash
 
 ENV PATH /usr/src/go/bin:$PATH
-ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
+ENV GOPATH /go
 
 # Only install one version of the registry, because old version which support
 # schema1 manifests is not working on ARM64, we should skip integration-cli
@@ -160,10 +160,10 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
 	aarch64/hello-world:latest@sha256:65a4a158587b307bb02db4de41b836addb0c35175bdc801367b1ac1ddeb9afda
 # See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
 
-# Install tomlv, runc, containerd, grimes, docker-proxy
+# Install tomlv, vndr, runc, containerd, grimes, docker-proxy
 # Please edit hack/dockerfile/install-binaries.sh to update them.
 COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
-RUN /tmp/install-binaries.sh tomlv runc containerd grimes proxy
+RUN /tmp/install-binaries.sh tomlv vndr runc containerd grimes proxy
 
 # Wrap all commands in the "docker-in-docker" script to allow nested containers
 ENTRYPOINT ["hack/dind"]

components/engine/Dockerfile.armhf

@@ -70,7 +70,7 @@ ENV GO_VERSION 1.7.3
 RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-armv6l.tar.gz" \
 	| tar -xzC /usr/local
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
-ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
+ENV GOPATH /go
 
 # We're building for armhf, which is ARMv7, so let's be explicit about that
 ENV GOARCH arm
@@ -164,10 +164,10 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
 	armhf/hello-world:latest@sha256:161dcecea0225975b2ad5f768058212c1e0d39e8211098666ffa1ac74cfb7791
 # See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
 
-# Install tomlv, runc, containerd, grimes, docker-proxy
+# Install tomlv, vndr, runc, containerd, grimes, docker-proxy
 # Please edit hack/dockerfile/install-binaries.sh to update them.
 COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
-RUN /tmp/install-binaries.sh tomlv runc containerd grimes proxy
+RUN /tmp/install-binaries.sh tomlv vndr runc containerd grimes proxy
 
 ENTRYPOINT ["hack/dind"]
 

components/engine/Dockerfile.ppc64le

@@ -108,7 +108,7 @@ RUN set -x \
 
 ENV GOROOT_BOOTSTRAP /usr/local/go
 ENV PATH /usr/local/go/bin/:$PATH
-ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
+ENV GOPATH /go
 
 # Dependency for golint
 ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3
@@ -183,10 +183,10 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
 	ppc64le/hello-world:latest@sha256:186a40a9a02ca26df0b6c8acdfb8ac2f3ae6678996a838f977e57fac9d963974
 # See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
 
-# Install tomlv, runc, containerd, grimes, docker-proxy
+# Install tomlv, vndr, runc, containerd, grimes, docker-proxy
 # Please edit hack/dockerfile/install-binaries.sh to update them.
 COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
-RUN /tmp/install-binaries.sh tomlv runc containerd grimes proxy
+RUN /tmp/install-binaries.sh tomlv vndr runc containerd grimes proxy
 
 # Wrap all commands in the "docker-in-docker" script to allow nested containers
 ENTRYPOINT ["hack/dind"]

components/engine/Dockerfile.s390x

@@ -100,7 +100,7 @@ RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-s390
 	| tar -xzC /usr/local
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
-ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
+ENV GOPATH /go
 
 # Dependency for golint
 ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3
@@ -175,10 +175,10 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
 	s390x/hello-world:latest@sha256:780d80b3a7677c3788c0d5cd9168281320c8d4a6d9183892d8ee5cdd610f5699
 # See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
 
-# Install tomlv, runc, containerd, grimes, docker-proxy
+# Install tomlv, vndr, runc, containerd, grimes, docker-proxy
 # Please edit hack/dockerfile/install-binaries.sh to update them.
 COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
-RUN /tmp/install-binaries.sh tomlv runc containerd grimes proxy
+RUN /tmp/install-binaries.sh tomlv vndr runc containerd grimes proxy
 
 # Wrap all commands in the "docker-in-docker" script to allow nested containers
 ENTRYPOINT ["hack/dind"]

components/engine/Dockerfile.simple

@@ -53,7 +53,7 @@ ENV GO_VERSION 1.7.3
 RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" \
 	| tar -xzC /usr/local
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
-ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
+ENV GOPATH /go
 ENV CGO_LDFLAGS -L/lib
 
 # Install runc, containerd, grimes and docker-proxy

components/engine/Dockerfile.windows

@@ -126,7 +126,7 @@ SHELL ["powershell", "-command"]
 #  - FROM_DOCKERFILE is used for detection of building within a container.
 ENV GO_VERSION=1.7.3 `
     GIT_LOCATION=https://github.com/git-for-windows/git/releases/download/v2.10.1.windows.1/Git-2.10.1-64-bit.exe `
-    GOPATH=C:\go;C:\go\src\github.com\docker\docker\vendor `
+    GOPATH=C:\go `
     GOROOT=C:\go `
     FROM_DOCKERFILE=1
 

components/engine/Makefile

@@ -50,7 +50,7 @@ DOCKER_MOUNT := $(if $(DOCKER_MOUNT),$(DOCKER_MOUNT),-v /go/src/github.com/docke
 
 # enable .go-pkg-cache if DOCKER_INCREMENTAL_BINARY and DOCKER_MOUNT (i.e.DOCKER_HOST) are set
 PKGCACHE_DIR := $(if $(PKGCACHE_DIR),$(PKGCACHE_DIR),.go-pkg-cache)
-PKGCACHE_MAP := gopath:/go/pkg vendor:/go/src/github.com/docker/docker/vendor/pkg goroot-linux_amd64_netgo:/usr/local/go/pkg/linux_amd64_netgo
+PKGCACHE_MAP := gopath:/go/pkg goroot-linux_amd64_netgo:/usr/local/go/pkg/linux_amd64_netgo
 DOCKER_MOUNT := $(if $(DOCKER_INCREMENTAL_BINARY),$(DOCKER_MOUNT) $(shell echo $(PKGCACHE_MAP) | sed -E 's@([^ ]*)@-v "$(CURDIR)/$(PKGCACHE_DIR)/\1"@g'),$(DOCKER_MOUNT))
 
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)

components/engine/daemon/logger/jsonfilelog/read.go

@@ -9,8 +9,8 @@ import (
 	"os"
 	"time"
 
+	"github.com/fsnotify/fsnotify"
 	"golang.org/x/net/context"
-	"gopkg.in/fsnotify.v1"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/daemon/logger"

components/engine/hack/.vendor-helpers.sh

@@ -1,148 +0,0 @@
-#!/usr/bin/env bash
-
-PROJECT=github.com/docker/docker
-
-# Downloads dependencies into vendor/ directory
-mkdir -p vendor
-
-if ! go list github.com/docker/docker/docker &> /dev/null; then
-	rm -rf .gopath
-	mkdir -p .gopath/src/github.com/docker
-	ln -sf ../../../.. .gopath/src/${PROJECT}
-	export GOPATH="${PWD}/.gopath:${PWD}/vendor"
-fi
-export GOPATH="$GOPATH:${PWD}/vendor"
-
-find='find'
-if [ "$(go env GOHOSTOS)" = 'windows' ]; then
-	find='/usr/bin/find'
-fi
-
-clone() {
-	local vcs="$1"
-	local pkg="$2"
-	local rev="$3"
-	local url="$4"
-
-	: ${url:=https://$pkg}
-	local target="vendor/src/$pkg"
-
-	echo -n "$pkg @ $rev: "
-
-	if [ -d "$target" ]; then
-		echo -n 'rm old, '
-		rm -rf "$target"
-	fi
-
-	echo -n 'clone, '
-	case "$vcs" in
-		git)
-			git clone --quiet --no-checkout "$url" "$target"
-			( cd "$target" && git checkout --quiet "$rev" && git reset --quiet --hard "$rev" )
-			;;
-		hg)
-			hg clone --quiet --updaterev "$rev" "$url" "$target"
-			;;
-	esac
-
-	echo -n 'rm VCS, '
-	( cd "$target" && rm -rf .{git,hg} )
-
-	echo -n 'rm vendor, '
-	( cd "$target" && rm -rf vendor Godeps/_workspace )
-
-	echo done
-}
-
-# get an ENV from the Dockerfile with support for multiline values
-_dockerfile_env() {
-	local e="$1"
-	awk '
-		$1 == "ENV" && $2 == "'"$e"'" {
-			sub(/^ENV +([^ ]+) +/, "");
-			inEnv = 1;
-		}
-		inEnv {
-			if (sub(/\\$/, "")) {
-				printf "%s", $0;
-				next;
-			}
-			print;
-			exit;
-		}
-	' ${DOCKER_FILE:="Dockerfile"}
-}
-
-clean() {
-	local packages=(
-		"${PROJECT}/cmd/dockerd" # daemon package main
-		"${PROJECT}/cmd/docker" # client package main
-		"${PROJECT}/integration-cli" # external tests
-	)
-	local dockerPlatforms=( ${DOCKER_ENGINE_OSARCH:="linux/amd64"} $(_dockerfile_env DOCKER_CROSSPLATFORMS) )
-	local dockerBuildTags="$(_dockerfile_env DOCKER_BUILDTAGS)"
-	local buildTagCombos=(
-		''
-		'experimental'
-		'pkcs11'
-		"$dockerBuildTags"
-		"daemon $dockerBuildTags"
-		"daemon cgo $dockerBuildTags"
-		"experimental $dockerBuildTags"
-		"experimental daemon $dockerBuildTags"
-		"experimental daemon cgo $dockerBuildTags"
-		"pkcs11 $dockerBuildTags"
-		"pkcs11 daemon $dockerBuildTags"
-		"pkcs11 daemon cgo $dockerBuildTags"
-	)
-
-	echo
-
-	echo -n 'collecting import graph, '
-	local IFS=$'\n'
-	local imports=( $(
-		for platform in "${dockerPlatforms[@]}"; do
-			export GOOS="${platform%/*}";
-			export GOARCH="${platform##*/}";
-			for buildTags in "${buildTagCombos[@]}"; do
-				go list -e -tags "$buildTags" -f '{{join .Deps "\n"}}' "${packages[@]}"
-				go list -e -tags "$buildTags" -f '{{join .TestImports "\n"}}' "${packages[@]}"
-			done
-		done | grep -vE "^${PROJECT}/" | sort -u
-	) )
-	imports=( $(go list -e -f '{{if not .Standard}}{{.ImportPath}}{{end}}' "${imports[@]}") )
-	unset IFS
-
-	echo -n 'pruning unused packages, '
-	findArgs=(
-		# This directory contains only .c and .h files which are necessary
-		-path vendor/src/github.com/mattn/go-sqlite3/code
-	)
-
-	for import in "${imports[@]}"; do
-		[ "${#findArgs[@]}" -eq 0 ] || findArgs+=( -or )
-		findArgs+=( -path "vendor/src/$import" )
-	done
-
-	local IFS=$'\n'
-	local prune=( $($find vendor -depth -type d -not '(' "${findArgs[@]}" ')') )
-	unset IFS
-	for dir in "${prune[@]}"; do
-		$find "$dir" -maxdepth 1 -not -type d -not -name 'LICENSE*' -not -name 'COPYING*' -exec rm -v -f '{}' ';'
-		rmdir "$dir" 2>/dev/null || true
-	done
-
-	echo -n 'pruning unused files, '
-	$find vendor -type f -name '*_test.go' -exec rm -v '{}' ';'
-	$find vendor -type f -name 'Vagrantfile' -exec rm -v '{}' ';'
-	local ci
-	for ci in .travis.yml .hound.yml appveyor.yml circle.yml codecov.yml; do
-		$find vendor -type f -name "$ci" -exec rm -v '{}' ';'
-	done
-
-	# These are the files that are left over after fix_rewritten_imports is run.
-	echo -n 'pruning .orig files, '
-	$find vendor -type f -name '*.orig' -exec rm -v '{}' ';'
-
-	echo done
-}

components/engine/hack/dockerfile/install-binaries.sh

@@ -7,6 +7,7 @@ RUNC_COMMIT=02f8fa7863dd3f82909a73e2061897828460d52f
 CONTAINERD_COMMIT=52ef1ceb4b660c42cf4ea9013180a5663968d4c7
 GRIMES_COMMIT=fe069a03affd2547fdb05e5b8b07202d2e41735b
 LIBNETWORK_COMMIT=0f534354b813003a754606689722fe253101bc4e
+VNDR_COMMIT=f56bd4504b4fad07a357913687fb652ee54bb3b0
 
 RM_GOPATH=0
 
@@ -93,6 +94,14 @@ do
 			PROXY_LDFLAGS="-linkmode=external" install_proxy
 			;;
 
+		vndr)
+			echo "Install vndr version $VNDR_COMMIT"
+			git clone https://github.com/LK4D4/vndr.git "$GOPATH/src/github.com/LK4D4/vndr"
+			cd "$GOPATH/src/github.com/LK4D4/vndr"
+			git checkout -q "$VNDR_COMMIT"
+			go build -v -o /usr/local/bin/vndr .
+			;;
+
 		*)
 			echo echo "Usage: $0 [tomlv|runc|containerd|grimes|proxy]"
 			exit 1

components/engine/hack/make.sh

@@ -101,7 +101,7 @@ if [ "$AUTO_GOPATH" ]; then
 	rm -rf .gopath
 	mkdir -p .gopath/src/"$(dirname "${DOCKER_PKG}")"
 	ln -sf ../../../.. .gopath/src/"${DOCKER_PKG}"
-	export GOPATH="${PWD}/.gopath:${PWD}/vendor"
+	export GOPATH="${PWD}/.gopath"
 
 	if [ "$(go env GOOS)" = 'solaris' ]; then
 		# sys/unix is installed outside the standard library on solaris

components/engine/hack/make/.binary

@@ -39,7 +39,7 @@ go build \
 		$LDFLAGS
 		$LDFLAGS_STATIC_DOCKER
 	" \
-	$SOURCE_PATH
+	$GO_PACKAGE
 )
 
 echo "Created binary: $DEST/$BINARY_FULLNAME"

components/engine/hack/make/binary-client

@@ -7,6 +7,6 @@ set -e
 (
 	source "${MAKEDIR}/.binary-setup"
 	export BINARY_SHORT_NAME="$DOCKER_CLIENT_BINARY_NAME"
-	export SOURCE_PATH='./cmd/docker'
+	export GO_PACKAGE='github.com/docker/docker/cmd/docker'
 	source "${MAKEDIR}/.binary"
 )

components/engine/hack/make/binary-daemon

@@ -7,7 +7,7 @@ set -e
 (
 	source "${MAKEDIR}/.binary-setup"
 	export BINARY_SHORT_NAME="$DOCKER_DAEMON_BINARY_NAME"
-	export SOURCE_PATH='./cmd/dockerd'
+	export GO_PACKAGE='github.com/docker/docker/cmd/dockerd'
 	source "${MAKEDIR}/.binary"
 	copy_binaries "$DEST" 'hash'
 )

components/engine/hack/make/dynbinary-client

@@ -3,7 +3,7 @@ set -e
 
 (
 	export BINARY_SHORT_NAME='docker'
-	export SOURCE_PATH='./cmd/docker'
+	export GO_PACKAGE='github.com/docker/docker/cmd/docker'
 	export IAMSTATIC='false'
 	export LDFLAGS_STATIC_DOCKER=''
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary

components/engine/hack/make/dynbinary-daemon

@@ -3,7 +3,7 @@ set -e
 
 (
 	export BINARY_SHORT_NAME='dockerd'
-	export SOURCE_PATH='./cmd/dockerd'
+	export GO_PACKAGE='github.com/docker/docker/cmd/dockerd'
 	export IAMSTATIC='false'
 	export LDFLAGS_STATIC_DOCKER=''
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary

components/engine/hack/validate/pkg-imports

@@ -11,7 +11,7 @@ unset IFS
 badFiles=()
 for f in "${files[@]}"; do
 	IFS=$'\n'
-	badImports=( $(go list -e -f '{{ join .Deps "\n" }}' "$f" | sort -u | grep -vE '^github.com/docker/docker/pkg/' | grep -E '^github.com/docker/docker' || true) )
+	badImports=( $(go list -e -f '{{ join .Deps "\n" }}' "$f" | sort -u | grep -vE '^github.com/docker/docker/pkg/' | grep -vE '^github.com/docker/docker/vendor' | grep -E '^github.com/docker/docker' || true) )
 	unset IFS
 
 	for import in "${badImports[@]}"; do

components/engine/hack/validate/vendor

@@ -4,21 +4,21 @@ export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "${SCRIPTDIR}/.validate"
 
 IFS=$'\n'
-files=( $(validate_diff --diff-filter=ACMR --name-only -- 'hack/vendor.sh' 'hack/.vendor-helpers.sh' 'vendor/' || true) ) 
+files=( $(validate_diff --diff-filter=ACMR --name-only -- 'vendor.conf' 'vendor/' || true) ) 
 unset IFS
 
 if [ ${#files[@]} -gt 0 ]; then
-	# We run vendor.sh to and see if we have a diff afterwards
-	./hack/vendor.sh >/dev/null
+	# We run vndr to and see if we have a diff afterwards
+	vndr
 	# Let see if the working directory is clean
 	diffs="$(git status --porcelain -- vendor 2>/dev/null)"
 	if [ "$diffs" ]; then
 		{
-			echo 'The result of ./hack/vendor.sh differs'
+			echo 'The result of vndr differs'
 			echo
 			echo "$diffs"
 			echo
-			echo 'Please vendor your package with ./hack/vendor.sh.'
+			echo 'Please vendor your package with github.com/LK4D4/vndr.'
 			echo
 		} >&2
 		false

components/engine/hack/vendor.sh

@@ -1,182 +1,15 @@
-#!/usr/bin/env bash
+#!/bin/bash
+
+# This file is just wrapper around vndr (github.com/LK4D4/vndr) tool.
+# For updating dependencies you should change `vendor.conf` file in root of the
+# project. Please refer to https://github.com/LK4D4/vndr/blob/master/README.md for
+# vndr usage.
+
 set -e
 
-# this script is used to update vendored dependencies
-#
-# Usage:
-# vendor.sh revendor all dependencies
-# vendor.sh github.com/docker/libkv revendor only the libkv dependency.
-# vendor.sh github.com/docker/libkv v0.2.1 vendor only libkv at the specified tag/commit.
-# vendor.sh git github.com/docker/libkv v0.2.1 is the same but specifies the VCS for cases where the VCS is something else than git
-# vendor.sh git golang.org/x/sys eb2c74142fd19a79b3f237334c7384d5167b1b46 https://github.com/golang/sys.git vendor only golang.org/x/sys downloading from the specified URL
-
-cd "$(dirname "$BASH_SOURCE")/.."
-source 'hack/.vendor-helpers.sh'
-
-case $# in
-0)
-	rm -rf vendor/
-	;;
-# If user passed arguments to the script
-1)
-	path="$PWD/hack/vendor.sh"
-	if ! cloneGrep="$(grep -E "^clone [^ ]+ $1" "$path")"; then
-		echo >&2 "error: failed to find 'clone ... $1' in $path"
-		exit 1
-	fi
-	eval "$cloneGrep"
-	clean
-	exit 0
-	;;
-2)
-	rm -rf "vendor/src/$1"
-	clone git "$1" "$2"
-	clean
-	exit 0
-	;;
-[34])
-	rm -rf "vendor/src/$2"
-	clone "$@"
-	clean
-	exit 0
-	;;
-*)
-	>&2 echo "error: unexpected parameters"
+if ! hash vndr; then
+	echo "Please install vndr with \"go get github.com/LK4D4/vndr\" and put it in your \$GOPATH"
 	exit 1
-	;;
-esac
+fi
 
-# the following lines are in sorted order, FYI
-clone git github.com/Azure/go-ansiterm 388960b655244e76e24c75f48631564eaefade62
-clone git github.com/Microsoft/hcsshim v0.5.2
-clone git github.com/Microsoft/go-winio v0.3.5
-clone git github.com/Sirupsen/logrus f76d643702a30fbffecdfe50831e11881c96ceb3 https://github.com/aaronlehmann/logrus
-clone git github.com/davecgh/go-spew 6d212800a42e8ab5c146b8ace3490ee17e5225f9
-clone git github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a
-clone git github.com/go-check/check 4ed411733c5785b40214c70bce814c3a3a689609 https://github.com/cpuguy83/check.git
-clone git github.com/gorilla/context v1.1
-clone git github.com/gorilla/mux v1.1
-clone git github.com/kr/pty 5cf931ef8f
-clone git github.com/mattn/go-shellwords v1.0.0
-clone git github.com/mattn/go-sqlite3 v1.1.0
-clone git github.com/tchap/go-patricia v2.2.6
-clone git github.com/vdemeester/shakers 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
-# forked golang.org/x/net package includes a patch for lazy loading trace templates
-clone git golang.org/x/net 2beffdc2e92c8a3027590f898fe88f69af48a3f8 https://github.com/tonistiigi/net.git
-clone git golang.org/x/sys eb2c74142fd19a79b3f237334c7384d5167b1b46 https://github.com/golang/sys.git
-clone git github.com/docker/go-units 8a7beacffa3009a9ac66bad506b18ffdd110cf97
-clone git github.com/docker/go-connections f512407a188ecb16f31a33dbc9c4e4814afc1b03
-
-clone git github.com/RackSec/srslog 365bf33cd9acc21ae1c355209865f17228ca534e
-clone git github.com/imdario/mergo 0.2.1
-
-#get libnetwork packages
-clone git github.com/docker/libnetwork 9ab6e136fa628b5bb4af4a75f76609ef2c21c024
-clone git github.com/docker/go-events 18b43f1bc85d9cdd42c05a6cd2d444c7a200a894
-clone git github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
-clone git github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
-clone git github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b
-clone git github.com/hashicorp/memberlist 88ac4de0d1a0ca6def284b571342db3b777a4c37
-clone git github.com/hashicorp/go-multierror fcdddc395df1ddf4247c69bd436e84cfa0733f7e
-clone git github.com/hashicorp/serf 598c54895cc5a7b1a24a398d635e8c0ea0959870
-clone git github.com/docker/libkv v0.2.1
-clone git github.com/vishvananda/netns 604eaf189ee867d8c147fafc28def2394e878d25
-clone git github.com/vishvananda/netlink e73bad418fd727ed3a02830b1af1ad0283a1de6c
-clone git github.com/BurntSushi/toml f706d00e3de6abe700c994cdd545a1a4915af060
-clone git github.com/samuel/go-zookeeper d0e0d8e11f318e000a8cc434616d69e329edc374
-clone git github.com/deckarep/golang-set ef32fa3046d9f249d399f98ebaf9be944430fd1d
-clone git github.com/coreos/etcd 3a49cbb769ebd8d1dd25abb1e83386e9883a5707
-clone git github.com/ugorji/go f1f1a805ed361a0e078bb537e4ea78cd37dcf065
-clone git github.com/hashicorp/consul v0.5.2
-clone git github.com/boltdb/bolt fff57c100f4dea1905678da7e90d92429dff2904
-clone git github.com/miekg/dns 75e6e86cc601825c5dbcd4e0c209eab180997cd7
-
-# get graph and distribution packages
-clone git github.com/docker/distribution fbb70dc3a14ca65cdac3aaf5e5122b03b42f6fbc
-clone git github.com/vbatts/tar-split v0.10.1
-
-# get go-zfs packages
-clone git github.com/mistifyio/go-zfs 22c9b32c84eb0d0c6f4043b6e90fc94073de92fa
-clone git github.com/pborman/uuid v1.0
-
-# get desired notary commit, might also need to be updated in Dockerfile
-clone git github.com/docker/notary v0.4.2
-
-clone git google.golang.org/grpc v1.0.2 https://github.com/grpc/grpc-go.git
-clone git github.com/miekg/pkcs11 df8ae6ca730422dba20c768ff38ef7d79077a59f
-clone git github.com/docker/go v1.5.1-1-1-gbaf439e
-clone git github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c
-
-clone git github.com/opencontainers/runc 02f8fa7863dd3f82909a73e2061897828460d52f # libcontainer
-clone git github.com/opencontainers/runtime-spec 1c7c27d043c2a5e513a44084d2b10d77d1402b8c # specs
-clone git github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
-# libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)
-clone git github.com/coreos/go-systemd v4
-clone git github.com/godbus/dbus v4.0.0
-clone git github.com/syndtr/gocapability 2c00daeb6c3b45114c80ac44119e7b8801fdd852
-clone git github.com/golang/protobuf 1f49d83d9aa00e6ce4fc8258c71cc7786aec968a
-
-# gelf logging driver deps
-clone git github.com/Graylog2/go-gelf aab2f594e4585d43468ac57287b0dece9d806883
-
-clone git github.com/fluent/fluent-logger-golang v1.2.1
-# fluent-logger-golang deps
-clone git github.com/philhofer/fwd 899e4efba8eaa1fea74175308f3fae18ff3319fa
-clone git github.com/tinylib/msgp 75ee40d2601edf122ef667e2a07d600d4c44490c
-
-# fsnotify
-clone git gopkg.in/fsnotify.v1 v1.2.11
-
-# awslogs deps
-clone git github.com/aws/aws-sdk-go v1.4.22
-clone git github.com/go-ini/ini 060d7da055ba6ec5ea7a31f116332fe5efa04ce0
-clone git github.com/jmespath/go-jmespath 0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74
-
-# logentries
-clone git github.com/bsphere/le_go d3308aafe090956bc89a65f0769f58251a1b4f03
-
-# gcplogs deps
-clone git golang.org/x/oauth2 2baa8a1b9338cf13d9eeb27696d761155fa480be https://github.com/golang/oauth2.git
-clone git google.golang.org/api dc6d2353af16e2a2b0ff6986af051d473a4ed468 https://code.googlesource.com/google-api-go-client
-clone git google.golang.org/cloud dae7e3d993bc3812a2185af60552bb6b847e52a0 https://code.googlesource.com/gocloud
-
-# native credentials
-clone git github.com/docker/docker-credential-helpers f72c04f1d8e71959a6d103f808c50ccbad79b9fd
-
-# containerd
-clone git github.com/docker/containerd 52ef1ceb4b660c42cf4ea9013180a5663968d4c7
-clone git github.com/tonistiigi/fifo 8c56881ce5e63e19e2dfc495c8af0fb90916467d
-
-# cluster
-clone git github.com/docker/swarmkit 4dfc88ccce14ced6f0a6ea82d46dca004c6de0e2
-clone git github.com/golang/mock bd3c8e81be01eef76d4b503f5e687d2d1354d2d9
-clone git github.com/gogo/protobuf v0.3
-clone git github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a
-clone git github.com/google/certificate-transparency d90e65c3a07988180c5b1ece71791c0b6506826e
-clone git golang.org/x/crypto 3fbbcd23f1cb824e69491a5930cfeff09b12f4d2 https://github.com/golang/crypto.git
-clone git golang.org/x/time a4bde12657593d5e90d0533a3e4fd95e635124cb https://github.com/golang/time.git
-clone git github.com/mreiferson/go-httpclient 63fe23f7434723dc904c901043af07931f293c47
-clone git github.com/hashicorp/go-memdb 98f52f52d7a476958fa9da671354d270c50661a7
-clone git github.com/hashicorp/go-immutable-radix 8e8ed81f8f0bf1bdd829593fdd5c29922c1ea990
-clone git github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4
-clone git github.com/coreos/pkg fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8
-clone git github.com/pivotal-golang/clock 3fd3c1944c59d9742e1cd333672181cd1a6f9fa0
-clone git github.com/prometheus/client_golang 52437c81da6b127a9925d17eb3a382a2e5fd395e
-clone git github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
-clone git github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
-clone git github.com/prometheus/common ebdfc6da46522d58825777cf1f90490a5b1ef1d8
-clone git github.com/prometheus/procfs abf152e5f3e97f2fafac028d2cc06c1feb87ffa5
-clone hg bitbucket.org/ww/goautoneg 75cd24fc2f2c2a2088577d12123ddee5f54e0675
-clone git github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a
-clone git github.com/pkg/errors 01fa4104b9c248c8945d14d9f128454d5b28d595
-
-# cli
-clone git github.com/spf13/cobra v1.4.1 https://github.com/dnephin/cobra.git
-clone git github.com/spf13/pflag dabebe21bf790f782ea4c7bbd2efc430de182afd
-clone git github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
-clone git github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff
-
-# metrics
-clone git github.com/docker/go-metrics 86138d05f285fd9737a99bee2d9be30866b59d72
-
-clean
+vndr "$@"

components/engine/man/Dockerfile

@@ -18,7 +18,7 @@ COPY    glide.yaml /manvendor/
 COPY    glide.lock /manvendor/
 WORKDIR /manvendor/
 RUN     glide install && mv vendor src
-ENV     GOPATH=$GOPATH:/go/src/github.com/docker/docker/vendor:/manvendor
+ENV     GOPATH=$GOPATH:/manvendor
 RUN     go build -o /usr/bin/go-md2man github.com/cpuguy83/go-md2man
 
 WORKDIR /go/src/github.com/docker/docker/

components/engine/man/Dockerfile.aarch64

@@ -18,7 +18,7 @@ COPY    glide.yaml /manvendor/
 COPY    glide.lock /manvendor/
 WORKDIR /manvendor/
 RUN     glide install && mv vendor src
-ENV     GOPATH=$GOPATH:/go/src/github.com/docker/docker/vendor:/manvendor
+ENV     GOPATH=$GOPATH:/manvendor
 RUN     go build -o /usr/bin/go-md2man github.com/cpuguy83/go-md2man
 
 WORKDIR /go/src/github.com/docker/docker/

components/engine/man/Dockerfile.armhf

@@ -18,7 +18,7 @@ COPY    glide.yaml /manvendor/
 COPY    glide.lock /manvendor/
 WORKDIR /manvendor/
 RUN     glide install && mv vendor src
-ENV     GOPATH=$GOPATH:/go/src/github.com/docker/docker/vendor:/manvendor
+ENV     GOPATH=$GOPATH:/manvendor
 RUN     go build -o /usr/bin/go-md2man github.com/cpuguy83/go-md2man
 
 WORKDIR /go/src/github.com/docker/docker/

components/engine/man/Dockerfile.ppc64le

@@ -18,7 +18,7 @@ COPY    glide.yaml /manvendor/
 COPY    glide.lock /manvendor/
 WORKDIR /manvendor/
 RUN     glide install && mv vendor src
-ENV     GOPATH=$GOPATH:/go/src/github.com/docker/docker/vendor:/manvendor
+ENV     GOPATH=$GOPATH:/manvendor
 RUN     go build -o /usr/bin/go-md2man github.com/cpuguy83/go-md2man
 
 WORKDIR /go/src/github.com/docker/docker/

components/engine/man/Dockerfile.s390x

@@ -18,7 +18,7 @@ COPY    glide.yaml /manvendor/
 COPY    glide.lock /manvendor/
 WORKDIR /manvendor/
 RUN     glide install && mv vendor src
-ENV     GOPATH=$GOPATH:/go/src/github.com/docker/docker/vendor:/manvendor
+ENV     GOPATH=$GOPATH:/manvendor
 RUN     go build -o /usr/bin/go-md2man github.com/cpuguy83/go-md2man
 
 WORKDIR /go/src/github.com/docker/docker/

components/engine/pkg/filenotify/filenotify.go

@@ -3,7 +3,7 @@
 // These are wrapped up in a common interface so that either can be used interchangeably in your code.
 package filenotify
 
-import "gopkg.in/fsnotify.v1"
+import "github.com/fsnotify/fsnotify"
 
 // FileWatcher is an interface for implementing file notification watchers
 type FileWatcher interface {

components/engine/pkg/filenotify/fsnotify.go

@@ -1,6 +1,6 @@
 package filenotify
 
-import "gopkg.in/fsnotify.v1"
+import "github.com/fsnotify/fsnotify"
 
 // fsNotifyWatcher wraps the fsnotify package to satisfy the FileNotifer interface
 type fsNotifyWatcher struct {

components/engine/pkg/filenotify/poller.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
-	"gopkg.in/fsnotify.v1"
+	"github.com/fsnotify/fsnotify"
 )
 
 var (

components/engine/pkg/filenotify/poller_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/fsnotify.v1"
+	"github.com/fsnotify/fsnotify"
 )
 
 func TestPollerAddRemove(t *testing.T) {

components/engine/project/PACKAGERS.md

@@ -73,7 +73,7 @@ To use the vendored dependencies, simply make sure the path to "./vendor" is
 included in `GOPATH` (or use `AUTO_GOPATH`, as explained below).
 
 If you would rather (or must, due to distro policy) package these dependencies
-yourself, take a look at "./hack/vendor.sh" for an easy-to-parse list of the
+yourself, take a look at "vendor.conf" for an easy-to-parse list of the
 exact version for each.
 
 NOTE: if you're not able to package the exact version (to the exact commit) of a

components/engine/vendor.conf

@@ -0,0 +1,132 @@
+# the following lines are in sorted order, FYI
+github.com/Azure/go-ansiterm 388960b655244e76e24c75f48631564eaefade62
+github.com/Microsoft/hcsshim v0.5.2
+github.com/Microsoft/go-winio v0.3.5
+github.com/Sirupsen/logrus f76d643702a30fbffecdfe50831e11881c96ceb3 https://github.com/aaronlehmann/logrus
+github.com/davecgh/go-spew 6d212800a42e8ab5c146b8ace3490ee17e5225f9
+github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a
+github.com/go-check/check 4ed411733c5785b40214c70bce814c3a3a689609 https://github.com/cpuguy83/check.git
+github.com/gorilla/context v1.1
+github.com/gorilla/mux v1.1
+github.com/kr/pty 5cf931ef8f
+github.com/mattn/go-shellwords v1.0.0
+github.com/mattn/go-sqlite3 v1.1.0
+github.com/tchap/go-patricia v2.2.6
+github.com/vdemeester/shakers 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
+# forked golang.org/x/net package includes a patch for lazy loading trace templates
+golang.org/x/net 2beffdc2e92c8a3027590f898fe88f69af48a3f8 https://github.com/tonistiigi/net.git
+golang.org/x/sys eb2c74142fd19a79b3f237334c7384d5167b1b46
+github.com/docker/go-units 8a7beacffa3009a9ac66bad506b18ffdd110cf97
+github.com/docker/go-connections f512407a188ecb16f31a33dbc9c4e4814afc1b03
+
+github.com/RackSec/srslog 365bf33cd9acc21ae1c355209865f17228ca534e
+github.com/imdario/mergo 0.2.1
+
+#get libnetwork packages
+github.com/docker/libnetwork 9ab6e136fa628b5bb4af4a75f76609ef2c21c024
+github.com/docker/go-events 18b43f1bc85d9cdd42c05a6cd2d444c7a200a894
+github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
+github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
+github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b
+github.com/hashicorp/memberlist 88ac4de0d1a0ca6def284b571342db3b777a4c37
+github.com/hashicorp/go-multierror fcdddc395df1ddf4247c69bd436e84cfa0733f7e
+github.com/hashicorp/serf 598c54895cc5a7b1a24a398d635e8c0ea0959870
+github.com/docker/libkv v0.2.1
+github.com/vishvananda/netns 604eaf189ee867d8c147fafc28def2394e878d25
+github.com/vishvananda/netlink e73bad418fd727ed3a02830b1af1ad0283a1de6c
+github.com/BurntSushi/toml f706d00e3de6abe700c994cdd545a1a4915af060
+github.com/samuel/go-zookeeper d0e0d8e11f318e000a8cc434616d69e329edc374
+github.com/deckarep/golang-set ef32fa3046d9f249d399f98ebaf9be944430fd1d
+github.com/coreos/etcd 3a49cbb769ebd8d1dd25abb1e83386e9883a5707
+github.com/ugorji/go f1f1a805ed361a0e078bb537e4ea78cd37dcf065
+github.com/hashicorp/consul v0.5.2
+github.com/boltdb/bolt fff57c100f4dea1905678da7e90d92429dff2904
+github.com/miekg/dns 75e6e86cc601825c5dbcd4e0c209eab180997cd7
+
+# get graph and distribution packages
+github.com/docker/distribution fbb70dc3a14ca65cdac3aaf5e5122b03b42f6fbc
+github.com/vbatts/tar-split v0.10.1
+
+# get go-zfs packages
+github.com/mistifyio/go-zfs 22c9b32c84eb0d0c6f4043b6e90fc94073de92fa
+github.com/pborman/uuid v1.0
+
+# get desired notary commit, might also need to be updated in Dockerfile
+github.com/docker/notary v0.4.2
+
+google.golang.org/grpc v1.0.2
+github.com/miekg/pkcs11 df8ae6ca730422dba20c768ff38ef7d79077a59f
+github.com/docker/go v1.5.1-1-1-gbaf439e
+github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c
+
+github.com/opencontainers/runc 02f8fa7863dd3f82909a73e2061897828460d52f # libcontainer
+github.com/opencontainers/runtime-spec 1c7c27d043c2a5e513a44084d2b10d77d1402b8c # specs
+github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
+# libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)
+github.com/coreos/go-systemd v4
+github.com/godbus/dbus v4.0.0
+github.com/syndtr/gocapability 2c00daeb6c3b45114c80ac44119e7b8801fdd852
+github.com/golang/protobuf 1f49d83d9aa00e6ce4fc8258c71cc7786aec968a
+
+# gelf logging driver deps
+github.com/Graylog2/go-gelf aab2f594e4585d43468ac57287b0dece9d806883
+
+github.com/fluent/fluent-logger-golang v1.2.1
+# fluent-logger-golang deps
+github.com/philhofer/fwd 899e4efba8eaa1fea74175308f3fae18ff3319fa
+github.com/tinylib/msgp 75ee40d2601edf122ef667e2a07d600d4c44490c
+
+# fsnotify
+github.com/fsnotify/fsnotify v1.2.1
+
+# awslogs deps
+github.com/aws/aws-sdk-go v1.4.22
+github.com/go-ini/ini 060d7da055ba6ec5ea7a31f116332fe5efa04ce0
+github.com/jmespath/go-jmespath 0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74
+
+# logentries
+github.com/bsphere/le_go d3308aafe090956bc89a65f0769f58251a1b4f03
+
+# gcplogs deps
+golang.org/x/oauth2 2baa8a1b9338cf13d9eeb27696d761155fa480be
+google.golang.org/api dc6d2353af16e2a2b0ff6986af051d473a4ed468
+google.golang.org/cloud dae7e3d993bc3812a2185af60552bb6b847e52a0
+
+# native credentials
+github.com/docker/docker-credential-helpers f72c04f1d8e71959a6d103f808c50ccbad79b9fd
+
+# containerd
+github.com/docker/containerd 52ef1ceb4b660c42cf4ea9013180a5663968d4c7
+github.com/tonistiigi/fifo 8c56881ce5e63e19e2dfc495c8af0fb90916467d
+
+# cluster
+github.com/docker/swarmkit 4dfc88ccce14ced6f0a6ea82d46dca004c6de0e2
+github.com/golang/mock bd3c8e81be01eef76d4b503f5e687d2d1354d2d9
+github.com/gogo/protobuf v0.3
+github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a
+github.com/google/certificate-transparency d90e65c3a07988180c5b1ece71791c0b6506826e
+golang.org/x/crypto 3fbbcd23f1cb824e69491a5930cfeff09b12f4d2
+golang.org/x/time a4bde12657593d5e90d0533a3e4fd95e635124cb
+github.com/mreiferson/go-httpclient 63fe23f7434723dc904c901043af07931f293c47
+github.com/hashicorp/go-memdb 98f52f52d7a476958fa9da671354d270c50661a7
+github.com/hashicorp/go-immutable-radix 8e8ed81f8f0bf1bdd829593fdd5c29922c1ea990
+github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4
+github.com/coreos/pkg fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8
+github.com/pivotal-golang/clock 3fd3c1944c59d9742e1cd333672181cd1a6f9fa0
+github.com/prometheus/client_golang 52437c81da6b127a9925d17eb3a382a2e5fd395e
+github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
+github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
+github.com/prometheus/common ebdfc6da46522d58825777cf1f90490a5b1ef1d8
+github.com/prometheus/procfs abf152e5f3e97f2fafac028d2cc06c1feb87ffa5
+bitbucket.org/ww/goautoneg 75cd24fc2f2c2a2088577d12123ddee5f54e0675
+github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a
+github.com/pkg/errors 01fa4104b9c248c8945d14d9f128454d5b28d595
+
+# cli
+github.com/spf13/cobra v1.4.1 https://github.com/dnephin/cobra.git
+github.com/spf13/pflag dabebe21bf790f782ea4c7bbd2efc430de182afd
+github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
+github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff
+
+# metrics
+github.com/docker/go-metrics 86138d05f285fd9737a99bee2d9be30866b59d72