From 66bd0579a37279a0950685c817d4a7e9bc5744fc Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Wed, 30 Mar 2016 10:29:27 -0700 Subject: [PATCH 1/2] Update vendoring test to use new vendor structure Signed-off-by: Riyaz Faizullabhoy --- misc/docker-integration-test.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/misc/docker-integration-test.py b/misc/docker-integration-test.py index 4c2da8e040..86ef0b82a1 100755 --- a/misc/docker-integration-test.py +++ b/misc/docker-integration-test.py @@ -65,9 +65,10 @@ def fake_vendor(): # based on a tag or SHA, and we want to build based on what was vendored in dockerfile_addition = ("\n" "RUN set -x && " - "GOPATH=$(pwd)/vendor/src/github.com/docker/notary/Godeps/_workspace:$GOPATH " + "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 &&" - "GOPATH=$(pwd)/vendor/src/github.com/docker/notary/Godeps/_workspace:$GOPATH " + "GOPATH=$(pwd)/vendor/src/github.com/docker/notary/vendor:$GOPATH " "go build -o /usr/local/bin/notary github.com/docker/notary/cmd/notary") with open(os.path.join(DOCKER_DIR, "Dockerfile")) as dockerfile: From de36693ce7d2e751f016fbcf5478c80b95a548e6 Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Tue, 5 Apr 2016 11:03:24 -0700 Subject: [PATCH 2/2] Remove vendor from GOPATH, use GO15VENDOREXPERIMENT flag Signed-off-by: Riyaz Faizullabhoy --- misc/docker-integration-test.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/misc/docker-integration-test.py b/misc/docker-integration-test.py index 86ef0b82a1..1a46bf8d77 100755 --- a/misc/docker-integration-test.py +++ b/misc/docker-integration-test.py @@ -66,9 +66,7 @@ def fake_vendor(): dockerfile_addition = ("\n" "RUN set -x && " "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 &&" - "GOPATH=$(pwd)/vendor/src/github.com/docker/notary/vendor:$GOPATH " "go build -o /usr/local/bin/notary github.com/docker/notary/cmd/notary") with open(os.path.join(DOCKER_DIR, "Dockerfile")) as dockerfile: