Make dockerd debuggable

Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-23 18:31:57 -07:00 · 2016-04-23 18:31:57 -07:00 · 0c7eab3157
commit 0c7eab3157
parent dc7664d62e
27 changed files with 11 additions and 10 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,7 +12,8 @@
 .gopath/
 autogen/
 bundles/
-docker/docker
+cmd/dockerd/dockerd
+cmd/docker/docker
 dockerversion/version_autogen.go
 docs/AWS_S3_BUCKET
 docs/GITCOMMIT
--- a/cmd/docker/client.go
+++ b/cmd/docker/client.go
--- a/cmd/docker/client_test.go
+++ b/cmd/docker/client_test.go
--- a/cmd/docker/daemon.go
+++ b/cmd/docker/daemon.go
--- a/cmd/docker/daemon_unix.go
+++ b/cmd/docker/daemon_unix.go
--- a/cmd/docker/daemon_windows.go
+++ b/cmd/docker/daemon_windows.go
--- a/cmd/docker/daemon_windows_test.go
+++ b/cmd/docker/daemon_windows_test.go
--- a/cmd/docker/docker.go
+++ b/cmd/docker/docker.go
--- a/cmd/docker/docker_windows.go
+++ b/cmd/docker/docker_windows.go
--- a/cmd/docker/flags.go
+++ b/cmd/docker/flags.go
--- a/cmd/docker/flags_test.go
+++ b/cmd/docker/flags_test.go
--- a/cmd/dockerd/README.md
+++ b/cmd/dockerd/README.md
--- a/cmd/dockerd/daemon.go
+++ b/cmd/dockerd/daemon.go
--- a/cmd/dockerd/daemon_freebsd.go
+++ b/cmd/dockerd/daemon_freebsd.go
--- a/cmd/dockerd/daemon_linux.go
+++ b/cmd/dockerd/daemon_linux.go
--- a/cmd/dockerd/daemon_test.go
+++ b/cmd/dockerd/daemon_test.go
--- a/cmd/dockerd/daemon_unix.go
+++ b/cmd/dockerd/daemon_unix.go
--- a/cmd/dockerd/daemon_unix_test.go
+++ b/cmd/dockerd/daemon_unix_test.go
--- a/cmd/dockerd/daemon_windows.go
+++ b/cmd/dockerd/daemon_windows.go
--- a/cmd/dockerd/docker.go
+++ b/cmd/dockerd/docker.go
--- a/cmd/dockerd/docker_windows.go
+++ b/cmd/dockerd/docker_windows.go
--- a/hack/.vendor-helpers.sh
+++ b/hack/.vendor-helpers.sh
@ -75,8 +75,8 @@ _dockerfile_env() {

 clean() {
 	local packages=(
-		"${PROJECT}/docker" # daemon package main
-		"${PROJECT}/client" # client package main
+		"${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) )
--- a/hack/make/binary-client
+++ b/hack/make/binary-client
@ -3,6 +3,6 @@ set -e

 (
 	export BINARY_SHORT_NAME='docker'
-	export SOURCE_PATH='./client'
+	export SOURCE_PATH='./cmd/docker'
 	source "${MAKEDIR}/.binary"
 )
--- a/hack/make/binary-daemon
+++ b/hack/make/binary-daemon
@ -3,7 +3,7 @@ set -e

 (
 	export BINARY_SHORT_NAME='dockerd'
-	export SOURCE_PATH='./docker'
+	export SOURCE_PATH='./cmd/dockerd'
 	source "${MAKEDIR}/.binary"
 	copy_containerd "$DEST" 'hash'
 )
--- a/hack/make/dynbinary-client
+++ b/hack/make/dynbinary-client
@ -3,7 +3,7 @@ set -e

 (
 	export BINARY_SHORT_NAME='docker'
-	export SOURCE_PATH='./client'
+	export SOURCE_PATH='./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
--- a/hack/make/dynbinary-daemon
+++ b/hack/make/dynbinary-daemon
@ -3,7 +3,7 @@ set -e

 (
 	export BINARY_SHORT_NAME='dockerd'
-	export SOURCE_PATH='./docker'
+	export SOURCE_PATH='./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
--- a/hack/make/gccgo
+++ b/hack/make/gccgo
@ -24,7 +24,7 @@ go build -compiler=gccgo \
 		-ldl
 		-pthread
 	" \
-	./docker
+	./cmd/dockerd

 echo "Created binary: $DEST/$BINARY_FULLNAME"
 ln -sf "$BINARY_FULLNAME" "$DEST/dockerd$BINARY_EXTENSION"
@ -42,7 +42,7 @@ go build -compiler=gccgo \
 		-ldl
 		-pthread
 	" \
-	./client
+	./cmd/docker

 echo "Created binary: $DEST/$CLIENTBIN_FULLNAME"
 ln -sf "$CLIENTBIN_FULLNAME" "$DEST/docker$BINARY_EXTENSION"