Переглянути джерело

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 <github@gone.nl>
Sebastiaan van Stijn 9 роки тому
батько
коміт
b4708e2754
3 змінених файлів з 0 додано та 3 видалено
  1. 0 1
      Dockerfile
  2. 0 1
      Dockerfile.aarch64
  3. 0 1
      Dockerfile.armhf

+ 0 - 1
Dockerfile

@@ -179,7 +179,6 @@ RUN set -x \
 # Install notary and notary-server
 # Install notary and notary-server
 ENV NOTARY_VERSION v0.3.0
 ENV NOTARY_VERSION v0.3.0
 RUN set -x \
 RUN set -x \
-	&& export GO15VENDOREXPERIMENT=1 \
 	&& export GOPATH="$(mktemp -d)" \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
 	&& 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") \

+ 0 - 1
Dockerfile.aarch64

@@ -119,7 +119,6 @@ RUN set -x \
 # Install notary and notary-server
 # Install notary and notary-server
 ENV NOTARY_VERSION v0.3.0
 ENV NOTARY_VERSION v0.3.0
 RUN set -x \
 RUN set -x \
-	&& export GO15VENDOREXPERIMENT=1 \
 	&& export GOPATH="$(mktemp -d)" \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
 	&& 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") \

+ 0 - 1
Dockerfile.armhf

@@ -128,7 +128,6 @@ RUN set -x \
 # Install notary and notary-server
 # Install notary and notary-server
 ENV NOTARY_VERSION v0.3.0
 ENV NOTARY_VERSION v0.3.0
 RUN set -x \
 RUN set -x \
-	&& export GO15VENDOREXPERIMENT=1 \
 	&& export GOPATH="$(mktemp -d)" \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
 	&& 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") \