diff --git a/CHANGELOG.md b/CHANGELOG.md index 975f4ff38..f5e531782 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## [v0.4.3](https://github.com/docker/notary/releases/tag/v0.4.3) 11/15/2016 ++ Fix build tags for static notary client binaries in linux [#1039](https://github.com/docker/notary/pull/1039) + ## [v0.4.2](https://github.com/docker/notary/releases/tag/v0.4.2) 9/30/2016 + Bump the cross compiler to golang 1.7.1, since [1.6.3 builds binaries that could have non-deterministic bugs in OS X Sierra](https://groups.google.com/forum/#!msg/golang-dev/Jho5sBHZgAg/cq6d97S1AwAJ) [#984](https://github.com/docker/notary/pull/984) diff --git a/Makefile b/Makefile index c5fcbcc92..94ff54b9e 100644 --- a/Makefile +++ b/Makefile @@ -79,15 +79,15 @@ ${PREFIX}/bin/static/notary: else ${PREFIX}/bin/static/notary-server: NOTARY_VERSION $(shell find . -type f -name '*.go') @echo "+ $@" - @go build -tags ${NOTARY_BUILDTAGS} -o $@ ${GO_LDFLAGS_STATIC} ./cmd/notary-server + @go build -tags "${NOTARY_BUILDTAGS} netgo" -o $@ ${GO_LDFLAGS_STATIC} ./cmd/notary-server ${PREFIX}/bin/static/notary-signer: NOTARY_VERSION $(shell find . -type f -name '*.go') @echo "+ $@" - @go build -tags ${NOTARY_BUILDTAGS} -o $@ ${GO_LDFLAGS_STATIC} ./cmd/notary-signer + @go build -tags "${NOTARY_BUILDTAGS} netgo" -o $@ ${GO_LDFLAGS_STATIC} ./cmd/notary-signer ${PREFIX}/bin/static/notary: @echo "+ $@" - @go build -tags ${NOTARY_BUILDTAGS} -o $@ ${GO_LDFLAGS_STATIC} ./cmd/notary + @go build -tags "${NOTARY_BUILDTAGS} netgo" -o $@ ${GO_LDFLAGS_STATIC} ./cmd/notary endif diff --git a/NOTARY_VERSION b/NOTARY_VERSION index 2b7c5ae01..17b2ccd9b 100644 --- a/NOTARY_VERSION +++ b/NOTARY_VERSION @@ -1 +1 @@ -0.4.2 +0.4.3 diff --git a/buildscripts/cross.sh b/buildscripts/cross.sh index 500ecb746..edf934ea7 100755 --- a/buildscripts/cross.sh +++ b/buildscripts/cross.sh @@ -40,8 +40,8 @@ for os in "$@"; do go build \ -o "${NOTARYDIR}/cross/${GOOS}/${GOARCH}/${OUTFILE}" \ -a \ - -tags "${BUILDTAGS}" \ + -tags "${BUILDTAGS} netgo" \ -ldflags "-w ${CTIMEVAR} ${LDFLAGS}" \ ./cmd/notary; set +x; -done +done \ No newline at end of file