pass in git commit override when building deb

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 3c70b56937c415c6bf3516aeaa5231c6d7d3145d)

VERSION

@@ -1 +1 @@
-17.06.0-dev
+17.06.0-ce-rc1

components/cli/VERSION

@@ -1 +1 @@
-17.06.0-dev
+17.06.0-ce-rc1

components/cli/docker.Makefile

@@ -8,6 +8,8 @@ DEV_DOCKER_IMAGE_NAME = docker-cli-dev
 LINTER_IMAGE_NAME = docker-cli-lint
 CROSS_IMAGE_NAME = docker-cli-cross
 MOUNTS = -v `pwd`:/go/src/github.com/docker/cli
+VERSION = $(shell cat VERSION)
+ENVVARS = -e VERSION=$(VERSION) -e GITCOMMIT
 
 # build docker image (dockerfiles/Dockerfile.build)
 .PHONY: build_docker_image
@@ -26,8 +28,7 @@ build_cross_image:
 
 # build executable using a container
 binary: build_docker_image
-	@echo "WARNING: this will drop a Linux executable on your host (not a macOS or Windows one)"
-	@docker run --rm $(MOUNTS) $(DEV_DOCKER_IMAGE_NAME) make binary
+	docker run --rm $(ENVVARS) $(MOUNTS) $(DEV_DOCKER_IMAGE_NAME) make binary
 
 build: binary
 
@@ -44,7 +45,7 @@ test: build_docker_image
 # build the CLI for multiple architectures using a container
 .PHONY: cross
 cross: build_cross_image
-	@docker run --rm $(MOUNTS) $(CROSS_IMAGE_NAME) make cross
+	docker run --rm $(ENVVARS) $(MOUNTS) $(CROSS_IMAGE_NAME) make cross
 
 .PHONY: watch
 watch: build_docker_image
@@ -68,4 +69,4 @@ vendor: build_docker_image vendor.conf
 	@docker run -ti --rm $(MOUNTS) $(DEV_DOCKER_IMAGE_NAME) make vendor
 
 dynbinary: build_cross_image
-	@docker run -ti --rm $(MOUNTS) $(CROSS_IMAGE_NAME) make dynbinary
+	docker run --rm $(ENVVARS) $(MOUNTS) $(CROSS_IMAGE_NAME) make dynbinary

components/cli/scripts/build/osx

@@ -11,7 +11,7 @@ export CGO_ENABLED=1
 export GOOS=darwin
 export GOARCH=amd64
 export CC=o64-clang
-export LDFLAGS='-linkmode external -s'
+export LDFLAGS="$LDFLAGS -linkmode external -s"
 export LDFLAGS_STATIC_DOCKER='-extld='${CC}
 
 # Override TARGET

components/engine/VERSION

@@ -1 +1 @@
-17.06.0-dev
+17.06.0-ce-rc1

components/packaging/deb/Makefile

@@ -47,6 +47,8 @@ ubuntu-trusty: ## build ubuntu trusty deb packages
 ubuntu-yakkety: ## build ubuntu yakkety deb packages
 	docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) .
 	docker run --rm \
+		-e VERSION=$(VERSION) \
+		-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
 		-v $(CURDIR)/debbuild/$@:/build \
 		-v $(ENGINE_DIR):/engine \
 		-v $(CLI_DIR):/cli \
@@ -56,6 +58,8 @@ ubuntu-yakkety: ## build ubuntu yakkety deb packages
 ubuntu-zesty: ## build ubuntu zesty deb packages
 	docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) .
 	docker run --rm \
+		-e VERSION=$(VERSION) \
+		-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
 		-v $(CURDIR)/debbuild/$@:/build \
 		-v $(ENGINE_DIR):/engine \
 		-v $(CLI_DIR):/cli \
@@ -65,6 +69,8 @@ ubuntu-zesty: ## build ubuntu zesty deb packages
 debian-jessie: ## build debian jessie deb packages
 	docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) .
 	docker run --rm \
+		-e VERSION=$(VERSION) \
+		-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
 		-v $(CURDIR)/debbuild/$@:/build \
 		-v $(ENGINE_DIR):/engine \
 		-v $(CLI_DIR):/cli \
@@ -74,6 +80,8 @@ debian-jessie: ## build debian jessie deb packages
 debian-stretch: ## build debian stretch deb packages
 	docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) .
 	docker run --rm \
+		-e VERSION=$(VERSION) \
+		-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
 		-v $(CURDIR)/debbuild/$@:/build \
 		-v $(ENGINE_DIR):/engine \
 		-v $(CLI_DIR):/cli \
@@ -83,6 +91,8 @@ debian-stretch: ## build debian stretch deb packages
 debian-wheezy: ## build debian wheezy deb packages
 	docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) .
 	docker run --rm \
+		-e VERSION=$(VERSION) \
+		-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
 		-v $(CURDIR)/debbuild/$@:/build \
 		-v $(ENGINE_DIR):/engine \
 		-v $(CLI_DIR):/cli \

components/packaging/deb/common/rules

@@ -12,7 +12,7 @@ override_dh_gencontrol:
 
 override_dh_auto_build:
 	cd engine && ./hack/make.sh dynbinary
-	cd cli && LDFLAGS="" make VERSION=$(VERSION) dynbinary
+	cd cli && LDFLAGS='' make VERSION=$(VERSION) GITCOMMIT=$(DOCKER_GITCOMMIT) dynbinary
 	# ./man/md2man-all.sh runs outside the build container (if at all), since we don't have go-md2man here
 
 override_dh_auto_test: