From 241898d136e41f80ab2dda95078f971a8248675d Mon Sep 17 00:00:00 2001 From: Michael Holzheu Date: Mon, 18 Apr 2016 18:49:59 +0200 Subject: [PATCH] Create "src" symlink for building notary with gcc 5 With gcc 5 version 1.4.2 of go is included. This version does not support go's "native vendoring" which is needed to build notary since git commit 51dc1747e4ab5 ("Move the godeps workspace to the vendor directory to be compliant with Go 1.6"). As a workaround create a symlink "vendor/src" that points to "vendor/". This allows to compile notary with gcc 5. Closes #22007 Signed-off-by: Michael Holzheu --- Dockerfile.s390x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.s390x b/Dockerfile.s390x index 40908f5b19..e16fc51660 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -113,7 +113,7 @@ RUN set -x \ && export GO15VENDOREXPERIMENT=1 \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \ - && (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \ + && (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION" && ln -s . vendor/src) \ && GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \ go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \ && rm -rf "$GOPATH"