Browse Source

Merge pull request #23061 from thaJeztah/remove-GO15VENDOREXPERIMENT

Remove GO15VENDOREXPERIMENT
Michael Crosby 9 years ago
parent
commit
58b4164feb
3 changed files with 0 additions and 3 deletions
  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") \