Skip to content

Commit

Permalink
Bump go version to 1.7.1, since 1.6.3 cannot build working binaries o…
Browse files Browse the repository at this point in the history
…n Mac OS Sierra

Signed-off-by: Ying Li <[email protected]>
  • Loading branch information
cyli committed Sep 30, 2016
1 parent ecd5400 commit 43850f7
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 7 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## [v0.4.2](https://github.com/docker/notary/releases/tag/v0.4.0) 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.0) 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)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.6.3
FROM golang:1.7.1

RUN apt-get update && apt-get install -y \
curl \
Expand Down
2 changes: 1 addition & 1 deletion NOTARY_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.1
0.4.2
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
3 changes: 1 addition & 2 deletions buildscripts/cross.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion server.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.6.3-alpine
FROM golang:1.7.1-alpine
MAINTAINER David Lawrence "[email protected]"

RUN apk add --update git gcc libc-dev && rm -rf /var/cache/apk/*
Expand Down
2 changes: 1 addition & 1 deletion signer.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.6.3-alpine
FROM golang:1.7.1-alpine
MAINTAINER David Lawrence "[email protected]"

RUN apk add --update git gcc libc-dev && rm -rf /var/cache/apk/*
Expand Down

0 comments on commit 43850f7

Please sign in to comment.