From b4708e275446aa85b6b37924dc9d3318cf69efd4 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 27 May 2016 18:15:01 +0200 Subject: [PATCH] Remove GO15VENDOREXPERIMENT This environment variable is no longer needed in Go 1.6 (as it's not the default). Removed this environment variable from all Dockerfiles except the Dockerfile.s390x, which is still using gcc 5.3 (Go 1.5) Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 1 - Dockerfile.aarch64 | 1 - Dockerfile.armhf | 1 - 3 files changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3be6e0a0b6..18a8550f46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -179,7 +179,6 @@ RUN set -x \ # Install notary and notary-server ENV NOTARY_VERSION v0.3.0 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") \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 9f122def23..63f0cc18d6 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -119,7 +119,6 @@ RUN set -x \ # Install notary and notary-server ENV NOTARY_VERSION v0.3.0 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") \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 6dc893ee84..b3f0b77a10 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -128,7 +128,6 @@ RUN set -x \ # Install notary and notary-server ENV NOTARY_VERSION v0.3.0 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") \