Browse code
Dockerfile.s390x: Move to gcc 6.1 (go 1.6.1)
Pull request #22840 and commit 40b21745cc ("Upgrade to golang 1.6.2")
introduces gcc 6.1 for Dockerfile.gccgo and Dockerfile.ppc64le.
So do this also for s390x and use "s390x/gcc:6.1" as base image.
In addition to this use "GO15VENDOREXPERIMENT=0" for notary build
as a workaround for:
* golang/go#15814
* golang/go#15628
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Michael Holzheu authored on 2016/05/31 04:47:54Showing 1 changed files
| ... | ... |
@@ -15,7 +15,7 @@ |
| 15 | 15 |
# the case. Therefore, you don't have to disable it anymore. |
| 16 | 16 |
# |
| 17 | 17 |
|
| 18 |
-FROM s390x/gcc:5.3 |
|
| 18 |
+FROM s390x/gcc:6.1 |
|
| 19 | 19 |
|
| 20 | 20 |
# Packaged dependencies |
| 21 | 21 |
RUN apt-get update && apt-get install -y \ |
| ... | ... |
@@ -130,9 +130,12 @@ RUN set -x \ |
| 130 | 130 |
&& rm -rf "$GOPATH" |
| 131 | 131 |
|
| 132 | 132 |
# Install notary and notary-server |
| 133 |
+# |
|
| 134 |
+# Note: We have to explicitly set GO15VENDOREXPERIMENT=0 because gccgo does not |
|
| 135 |
+# support vendoring: https://github.com/golang/go/issues/15628 |
|
| 133 | 136 |
ENV NOTARY_VERSION v0.3.0 |
| 134 | 137 |
RUN set -x \ |
| 135 |
- && export GO15VENDOREXPERIMENT=1 \ |
|
| 138 |
+ && export GO15VENDOREXPERIMENT=0 \ |
|
| 136 | 139 |
&& export GOPATH="$(mktemp -d)" \ |
| 137 | 140 |
&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \ |
| 138 | 141 |
&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION" && ln -s . vendor/src) \ |