From 8e602b91243196949037b54f451a220c8a8cc600 Mon Sep 17 00:00:00 2001 From: Ying Li Date: Thu, 8 Sep 2016 00:04:23 -0700 Subject: [PATCH 1/2] Bump go version to 1.7.1, since 1.6.3 cannot build working binaries on Mac OS Sierra Signed-off-by: Ying Li --- CHANGELOG.md | 5 ++++- Dockerfile | 2 +- NOTARY_VERSION | 2 +- README.md | 3 ++- buildscripts/cross.sh | 3 +-- server.Dockerfile | 2 +- signer.Dockerfile | 2 +- 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b68d9696..dea827ad4 100644 --- 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 index 04c23aac3..616cc05b9 100644 --- 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 index 267577d47..2b7c5ae01 100644 --- a/NOTARY_VERSION +++ b/NOTARY_VERSION @@ -1 +1 @@ -0.4.1 +0.4.2 diff --git a/README.md b/README.md index 152468e33..e81a91c10 100644 --- 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 index 3e257da33..500ecb746 100755 --- 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/server.Dockerfile b/server.Dockerfile index a55fb000b..c96ab6787 100644 --- 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 index 9c63f8ff9..8c6f2d845 100644 --- 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/* From a2945616829a0ee51e0c34e280716938c773a506 Mon Sep 17 00:00:00 2001 From: Ying Li Date: Fri, 30 Sep 2016 17:20:03 -0700 Subject: [PATCH 2/2] Hack to get around some for temporary circle instability Signed-off-by: Ying Li --- buildscripts/testclient.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/buildscripts/testclient.py b/buildscripts/testclient.py index e29d5670a..ecd65bd45 100755 --- 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