Remove vendor from GOPATH, use GO15VENDOREXPERIMENT flag

Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
This commit is contained in:
Riyaz Faizullabhoy 2016-04-05 11:03:24 -07:00
parent 66bd0579a3
commit de36693ce7
1 changed files with 0 additions and 2 deletions

View File

@ -66,9 +66,7 @@ def fake_vendor():
dockerfile_addition = ("\n" dockerfile_addition = ("\n"
"RUN set -x && " "RUN set -x && "
"export GO15VENDOREXPERIMENT=1 && " "export GO15VENDOREXPERIMENT=1 && "
"GOPATH=$(pwd)/vendor/src/github.com/docker/notary/vendor:$GOPATH "
"go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server &&" "go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server &&"
"GOPATH=$(pwd)/vendor/src/github.com/docker/notary/vendor:$GOPATH "
"go build -o /usr/local/bin/notary github.com/docker/notary/cmd/notary") "go build -o /usr/local/bin/notary github.com/docker/notary/cmd/notary")
with open(os.path.join(DOCKER_DIR, "Dockerfile")) as dockerfile: with open(os.path.join(DOCKER_DIR, "Dockerfile")) as dockerfile: