mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	Make dockerd debuggable
Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
		
							parent
							
								
									dc7664d62e
								
							
						
					
					
						commit
						0c7eab3157
					
				
					 27 changed files with 11 additions and 10 deletions
				
			
		
							
								
								
									
										3
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -12,7 +12,8 @@
 | 
				
			||||||
.gopath/
 | 
					.gopath/
 | 
				
			||||||
autogen/
 | 
					autogen/
 | 
				
			||||||
bundles/
 | 
					bundles/
 | 
				
			||||||
docker/docker
 | 
					cmd/dockerd/dockerd
 | 
				
			||||||
 | 
					cmd/docker/docker
 | 
				
			||||||
dockerversion/version_autogen.go
 | 
					dockerversion/version_autogen.go
 | 
				
			||||||
docs/AWS_S3_BUCKET
 | 
					docs/AWS_S3_BUCKET
 | 
				
			||||||
docs/GITCOMMIT
 | 
					docs/GITCOMMIT
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -75,8 +75,8 @@ _dockerfile_env() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
clean() {
 | 
					clean() {
 | 
				
			||||||
	local packages=(
 | 
						local packages=(
 | 
				
			||||||
		"${PROJECT}/docker" # daemon package main
 | 
							"${PROJECT}/cmd/dockerd" # daemon package main
 | 
				
			||||||
		"${PROJECT}/client" # client package main
 | 
							"${PROJECT}/cmd/docker" # client package main
 | 
				
			||||||
		"${PROJECT}/integration-cli" # external tests
 | 
							"${PROJECT}/integration-cli" # external tests
 | 
				
			||||||
	)
 | 
						)
 | 
				
			||||||
	local dockerPlatforms=( ${DOCKER_ENGINE_OSARCH:="linux/amd64"} $(_dockerfile_env DOCKER_CROSSPLATFORMS) )
 | 
						local dockerPlatforms=( ${DOCKER_ENGINE_OSARCH:="linux/amd64"} $(_dockerfile_env DOCKER_CROSSPLATFORMS) )
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,6 +3,6 @@ set -e
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(
 | 
					(
 | 
				
			||||||
	export BINARY_SHORT_NAME='docker'
 | 
						export BINARY_SHORT_NAME='docker'
 | 
				
			||||||
	export SOURCE_PATH='./client'
 | 
						export SOURCE_PATH='./cmd/docker'
 | 
				
			||||||
	source "${MAKEDIR}/.binary"
 | 
						source "${MAKEDIR}/.binary"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,7 +3,7 @@ set -e
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(
 | 
					(
 | 
				
			||||||
	export BINARY_SHORT_NAME='dockerd'
 | 
						export BINARY_SHORT_NAME='dockerd'
 | 
				
			||||||
	export SOURCE_PATH='./docker'
 | 
						export SOURCE_PATH='./cmd/dockerd'
 | 
				
			||||||
	source "${MAKEDIR}/.binary"
 | 
						source "${MAKEDIR}/.binary"
 | 
				
			||||||
	copy_containerd "$DEST" 'hash'
 | 
						copy_containerd "$DEST" 'hash'
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
| 
						 | 
					@ -3,7 +3,7 @@ set -e
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(
 | 
					(
 | 
				
			||||||
	export BINARY_SHORT_NAME='docker'
 | 
						export BINARY_SHORT_NAME='docker'
 | 
				
			||||||
	export SOURCE_PATH='./client'
 | 
						export SOURCE_PATH='./cmd/docker'
 | 
				
			||||||
	export IAMSTATIC='false'
 | 
						export IAMSTATIC='false'
 | 
				
			||||||
	export LDFLAGS_STATIC_DOCKER=''
 | 
						export LDFLAGS_STATIC_DOCKER=''
 | 
				
			||||||
	export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
 | 
						export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,7 +3,7 @@ set -e
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(
 | 
					(
 | 
				
			||||||
	export BINARY_SHORT_NAME='dockerd'
 | 
						export BINARY_SHORT_NAME='dockerd'
 | 
				
			||||||
	export SOURCE_PATH='./docker'
 | 
						export SOURCE_PATH='./cmd/dockerd'
 | 
				
			||||||
	export IAMSTATIC='false'
 | 
						export IAMSTATIC='false'
 | 
				
			||||||
	export LDFLAGS_STATIC_DOCKER=''
 | 
						export LDFLAGS_STATIC_DOCKER=''
 | 
				
			||||||
	export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
 | 
						export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -24,7 +24,7 @@ go build -compiler=gccgo \
 | 
				
			||||||
		-ldl
 | 
							-ldl
 | 
				
			||||||
		-pthread
 | 
							-pthread
 | 
				
			||||||
	" \
 | 
						" \
 | 
				
			||||||
	./docker
 | 
						./cmd/dockerd
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "Created binary: $DEST/$BINARY_FULLNAME"
 | 
					echo "Created binary: $DEST/$BINARY_FULLNAME"
 | 
				
			||||||
ln -sf "$BINARY_FULLNAME" "$DEST/dockerd$BINARY_EXTENSION"
 | 
					ln -sf "$BINARY_FULLNAME" "$DEST/dockerd$BINARY_EXTENSION"
 | 
				
			||||||
| 
						 | 
					@ -42,7 +42,7 @@ go build -compiler=gccgo \
 | 
				
			||||||
		-ldl
 | 
							-ldl
 | 
				
			||||||
		-pthread
 | 
							-pthread
 | 
				
			||||||
	" \
 | 
						" \
 | 
				
			||||||
	./client
 | 
						./cmd/docker
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "Created binary: $DEST/$CLIENTBIN_FULLNAME"
 | 
					echo "Created binary: $DEST/$CLIENTBIN_FULLNAME"
 | 
				
			||||||
ln -sf "$CLIENTBIN_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
 | 
					ln -sf "$CLIENTBIN_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue