From 595dcd23c007634df6f04810367023a3d84e376b Mon Sep 17 00:00:00 2001 From: Michael Friis Date: Sat, 13 May 2017 18:05:40 -0700 Subject: [PATCH 1/2] sh wont always have source Signed-off-by: Michael Friis --- scripts/build/binary | 2 +- scripts/build/cross | 2 +- scripts/build/ldflags | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build/binary b/scripts/build/binary index 9f6f47281220..c317a47b324f 100755 --- a/scripts/build/binary +++ b/scripts/build/binary @@ -1,5 +1,5 @@ #!/usr/bin/env sh -source ./scripts/build/ldflags +. ./scripts/build/ldflags go build -o ./build/docker --ldflags "${LDFLAGS}" github.com/docker/cli/cmd/docker diff --git a/scripts/build/cross b/scripts/build/cross index 4e113943a4d2..9a1cd7fdbbc0 100755 --- a/scripts/build/cross +++ b/scripts/build/cross @@ -1,6 +1,6 @@ #!/usr/bin/env sh -source ./scripts/build/ldflags +. ./scripts/build/ldflags gox -output build/docker-{{.OS}}-{{.Arch}} \ -osarch="linux/arm linux/amd64 darwin/amd64 windows/amd64" \ diff --git a/scripts/build/ldflags b/scripts/build/ldflags index a0c5e1f9e63c..a450a5a08840 100755 --- a/scripts/build/ldflags +++ b/scripts/build/ldflags @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh VERSION=${VERSION:-"unknown-version"} GITCOMMIT=${GITCOMMIT:-$(git rev-parse --short HEAD 2> /dev/null || true)} From 2ab09c775a4b02400a274d15b25da5e04982adf8 Mon Sep 17 00:00:00 2001 From: Michael Friis Date: Sat, 13 May 2017 18:03:25 -0700 Subject: [PATCH 2/2] set CGO Signed-off-by: Michael Friis --- scripts/build/binary | 2 +- scripts/build/cross | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build/binary b/scripts/build/binary index c317a47b324f..1581c0a677c6 100755 --- a/scripts/build/binary +++ b/scripts/build/binary @@ -2,4 +2,4 @@ . ./scripts/build/ldflags -go build -o ./build/docker --ldflags "${LDFLAGS}" github.com/docker/cli/cmd/docker +CGO_ENABLED=0 go build -o ./build/docker --ldflags "${LDFLAGS}" github.com/docker/cli/cmd/docker diff --git a/scripts/build/cross b/scripts/build/cross index 9a1cd7fdbbc0..7f6b930f5e91 100755 --- a/scripts/build/cross +++ b/scripts/build/cross @@ -2,7 +2,7 @@ . ./scripts/build/ldflags -gox -output build/docker-{{.OS}}-{{.Arch}} \ +CGO_ENABLED=0 gox -output build/docker-{{.OS}}-{{.Arch}} \ -osarch="linux/arm linux/amd64 darwin/amd64 windows/amd64" \ --ldflags "${LDFLAGS}" \ github.com/docker/cli/cmd/docker