Merge pull request #22276 from Microsoft/jjh/dockerd

Move docker and dockerd main packages in directories with same name, under `cmd/`

.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

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) )

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"
 )

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'
-)
+)

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

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

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"