Finished hotfix 0.4.2.

notaryproject · Oct 1, 2016 · c8aa8cf · c8aa8cf
2 parents 2efc459 + 8263693
commit c8aa8cf
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 
-## [v0.4.1](https://github.com/docker/notary/releases/tag/v0.4.0) 9/27/2016
+## [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)
+
+## [v0.4.1](https://github.com/docker/notary/releases/tag/v0.4.1) 9/27/2016
 + Preliminary Windows support for notary client [#970](https://github.com/docker/notary/pull/970)
 + Output message to CLI when repo changes have been successfully published [#974](https://github.com/docker/notary/pull/974)
 + Improved error messages for client authentication errors and for the witness command [#972](https://github.com/docker/notary/pull/972)

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.6.3
+FROM golang:1.7.1
 
 RUN apt-get update && apt-get install -y \
 	curl \

diff --git a/NOTARY_VERSION b/NOTARY_VERSION
@@ -1 +1 @@
-0.4.1
+0.4.2
diff --git a/README.md b/README.md
@@ -80,7 +80,8 @@ to use `notary` with Docker images.
 
 Prerequisites:
 
-- Go >= 1.6.1
+- Go >= 1.7
+
 - [godep](https://github.com/tools/godep) installed
 - libtool development headers installed
     - Ubuntu: `apt-get install libltdl-dev`

diff --git a/buildscripts/cross.sh b/buildscripts/cross.sh
@@ -15,9 +15,8 @@ for os in "$@"; do
 	if [[ "${GOOS}" == "darwin" ]]; then
 		export CC="o64-clang"
 		export CXX="o64-clang++"
-		# -ldflags=-s:  see https://github.com/golang/go/issues/11994 - TODO: this has been fixed in go 1.7.1
 		# darwin binaries can't be compiled to be completely static with the -static flag
-		LDFLAGS="-s"
+		LDFLAGS=""
 	else
 		# no building with Cgo.  Also no building with pkcs11
 		if [[ "${GOOS}" == "windows" ]]; then

diff --git a/buildscripts/testclient.py b/buildscripts/testclient.py
@@ -333,6 +333,10 @@ def wait_for_server(server, timeout_in_seconds):
         raise Exception(
             "Could not connect to {0} after {1} seconds.".format(server, timeout_in_seconds))
 
+    # sleep for 30 extra seconds to wait for the server to connect to the signer
+    sleep(30)
+
+
 def run():
     """
     Run the client tests

diff --git a/server.Dockerfile b/server.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.6.3-alpine
+FROM golang:1.7.1-alpine
 MAINTAINER David Lawrence "david.lawrence@docker.com"
 
 RUN apk add --update git gcc libc-dev && rm -rf /var/cache/apk/*

diff --git a/signer.Dockerfile b/signer.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.6.3-alpine
+FROM golang:1.7.1-alpine
 MAINTAINER David Lawrence "david.lawrence@docker.com"
 
 RUN apk add --update git gcc libc-dev && rm -rf /var/cache/apk/*