Support building a dynbinary

.gitignore

@@ -1,2 +1,2 @@
 .DS_Store
-build
+./build

Makefile

@@ -28,6 +28,9 @@ lint:
 cross: clean
 	@./scripts/build/cross
 
+dynbinary: clean
+	@./scripts/build/dynbinary
+
 # download dependencies (vendor/) listed in vendor.conf
 .PHONY: vendor
 vendor: vendor.conf

docker.Makefile

@@ -6,6 +6,7 @@
 
 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
 
 # build docker image (dockerfiles/Dockerfile.build)
@@ -18,6 +19,11 @@ build_docker_image:
 build_linter_image:
 	@docker build -q -t $(LINTER_IMAGE_NAME) -f ./dockerfiles/Dockerfile.lint .
 
+.PHONY: build_cross_image
+build_cross_image:
+	@docker build -t $(CROSS_IMAGE_NAME) -f ./dockerfiles/Dockerfile.cross .
+
+
 # build executable using a container
 .PHONY: build
 build: build_docker_image
@@ -44,6 +50,8 @@ cross: build_docker_image
 dev: build_docker_image
 	@docker run -ti $(MOUNTS) -v /var/run/docker.sock:/var/run/docker.sock $(DEV_DOCKER_IMAGE_NAME) ash
 
+shell: dev
+
 # run linters in a container
 .PHONY: lint
 lint: build_linter_image
@@ -53,3 +61,6 @@ lint: build_linter_image
 .PHONY: vendor
 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

dockerfiles/Dockerfile.build

@@ -1,7 +1,7 @@
 
 FROM    golang:1.8-alpine
 
-RUN     apk add -U git make
+RUN     apk add -U git make bash
 
 RUN     go get github.com/LK4D4/vndr && \
         cp /go/bin/vndr /usr/bin && \

dockerfiles/Dockerfile.cross

@@ -0,0 +1,8 @@
+
+FROM    golang:1.8.1
+
+# allow replacing httpredir or deb mirror
+ARG     APT_MIRROR=deb.debian.org
+RUN     sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
+
+WORKDIR /go/src/github.com/docker/cli

scripts/build/binary

@@ -1,4 +1,6 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
+
+set -eu -o pipefail
 
 source ./scripts/build/ldflags
 

scripts/build/dynbinary

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -eu -o pipefail
+
+source ./scripts/build/ldflags
+
+go build \
+    -o ./build/docker \
+    --ldflags "${LDFLAGS}" \
+    github.com/docker/cli/cmd/docker

scripts/build/ldflags

@@ -4,6 +4,10 @@ VERSION=${VERSION:-"unknown-version"}
 GITCOMMIT=${GITCOMMIT:-$(git rev-parse --short HEAD 2> /dev/null || true)}
 BUILDTIME=${BUILDTIME:-$(date --utc --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')}
 
-export LDFLAGS="-X github.com/docker/cli/cli.GitCommit=${GITCOMMIT} \
-		-X github.com/docker/cli/cli.BuildTime=${BUILDTIME} \
-		-X github.com/docker/cli/cli.Version=${VERSION} ${LDFLAGS}"
+export LDFLAGS="\
+    -w \
+    -X github.com/docker/cli/cli.GitCommit=${GITCOMMIT} \
+    -X github.com/docker/cli/cli.BuildTime=${BUILDTIME} \
+    -X github.com/docker/cli/cli.Version=${VERSION} \
+    ${LDFLAGS:-} \
+"