From e8c96a024259a1eac5e993fd584cbea9bd22a35e Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom@weave.works>
Date: Thu, 22 Oct 2015 12:39:41 +0000
Subject: [PATCH] Turn on GO15VENDOREXPERIMENT in build container; don't go
 get.

---
 Makefile           | 4 ----
 backend/Dockerfile | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index afd10d379..c1b17de9a 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,6 @@ $(APP_EXE): app/*.go render/*.go report/*.go xfer/*.go common/sanitize/*.go
 $(PROBE_EXE): probe/*.go probe/docker/*.go probe/kubernetes/*.go probe/endpoint/*.go probe/host/*.go probe/process/*.go probe/overlay/*.go report/*.go xfer/*.go common/sanitize/*.go common/exec/*.go
 
 $(APP_EXE) $(PROBE_EXE):
-	go get -d -tags netgo ./$(@D)
 	go build -ldflags "-extldflags \"-static\" -X main.version $(SCOPE_VERSION)" -tags netgo -o $@ ./$(@D)
 	@strings $@ | grep cgo_stub\\\.go >/dev/null || { \
 	        rm $@; \
@@ -102,6 +101,3 @@ deps:
 		github.com/mjibson/esc \
 		github.com/kisielk/errcheck \
 		github.com/aktau/github-release
-
-update:
-	go get -u -f -v -tags netgo ./...
diff --git a/backend/Dockerfile b/backend/Dockerfile
index dc2716f1e..cb5c82d94 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,4 +1,4 @@
 FROM golang:1.5.1
+ENV GO15VENDOREXPERIMENT 1
 RUN apt-get update && apt-get install -y libpcap-dev
 COPY build.bash /
-