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> Upstream-commit: b5490d48979c3afa29d50dc8527aa6579cd1e634 Component: engine