From 49b2029656d882f3a72b7d947ae9f67f965f063a Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Thu, 19 Dec 2019 10:24:15 -0600
Subject: [PATCH] Run "go mod vendor" outside of Docker so authenticated
 modules may use system credentials

---
 Dockerfile-clustertests                  | 5 +----
 Makefile                                 | 4 ++--
 internal/clustertests/docker-compose.yml | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Dockerfile-clustertests b/Dockerfile-clustertests
index 69fbd9a54..6241ae70d 100644
--- a/Dockerfile-clustertests
+++ b/Dockerfile-clustertests
@@ -8,10 +8,7 @@ LABEL maintainer "dev@pilosa.com"
 COPY . /go/src/github.com/pilosa/pilosa/
 
 RUN cd /go/src/github.com/pilosa/pilosa \
-    && GO111MODULE=on make vendor
-
-RUN cd /go/src/github.com/pilosa/pilosa \
-    && CGO_ENABLED=0 make install FLAGS="-a"
+    && CGO_ENABLED=0 make install FLAGS="-a -mod=vendor"
 
 # download pumba for fault injection
 ADD https://github.com/alexei-led/pumba/releases/download/0.6.0/pumba_linux_amd64 /pumba
diff --git a/Makefile b/Makefile
index 55356bd59..20f00ac03 100644
--- a/Makefile
+++ b/Makefile
@@ -87,14 +87,14 @@ DOCKER_COMPOSE=internal/clustertests/docker-compose.yml
 # running. This will catch changes to internal/clustertests/*.go, but if you
 # make changes to Pilosa, you'll want to run clustertests-build to rebuild the
 # pilosa image.
-clustertests:
+clustertests: vendor
 	docker-compose -f $(DOCKER_COMPOSE) down
 	docker-compose -f $(DOCKER_COMPOSE) build client1
 	docker-compose -f $(DOCKER_COMPOSE) up --exit-code-from=client1
 
 
 # Like clustertests, but rebuilds all images.
-clustertests-build:
+clustertests-build: vendor
 	docker-compose -f $(DOCKER_COMPOSE) down
 	docker-compose -f $(DOCKER_COMPOSE) up --exit-code-from=client1 --build
 
diff --git a/internal/clustertests/docker-compose.yml b/internal/clustertests/docker-compose.yml
index 1546a5b13..36b418921 100644
--- a/internal/clustertests/docker-compose.yml
+++ b/internal/clustertests/docker-compose.yml
@@ -51,6 +51,6 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     command:
-      - "cd /go/src/github.com/pilosa/pilosa/ && go test -v -count=1 github.com/pilosa/pilosa/v2/internal/clustertests"
+      - "cd /go/src/github.com/pilosa/pilosa/ && go test -mod=vendor -v -count=1 github.com/pilosa/pilosa/v2/internal/clustertests"
 networks: 
   pilosanet: