From 3d7781df70704933d0db3298c5090ec6abf5a726 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Wed, 13 Nov 2019 06:16:53 +0000
Subject: [PATCH] Disable go modules only in dapper, not always

---
 Dockerfile.dapper | 1 +
 scripts/build     | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 4c0b9e2ddc..fa32e030e0 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -24,6 +24,7 @@ RUN if [ "$DQLITE" = true ]; then \
         apk add --allow-untrusted /usr/local/packages/*.apk \
     ;fi
 
+ENV GO111MODULE off
 ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/rancher/k3s/.cache
 ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE
 ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/
diff --git a/scripts/build b/scripts/build
index 96ac81028f..1f73fdd4ed 100755
--- a/scripts/build
+++ b/scripts/build
@@ -10,8 +10,6 @@ PKG_CONTAINERD="github.com/containerd/containerd"
 PKG_RANCHER_CONTAINERD="github.com/rancher/containerd"
 PKG_CRICTL="github.com/kubernetes-sigs/cri-tools"
 
-export GO111MODULE=off
-
 VENDOR_PREFIX="${PKG}/vendor/"
 VERSIONFLAGS="
     -X ${PKG}/pkg/version.Version=${VERSION}