Disable go modules only in dapper, not always

k3s-io · Nov 13, 2019 · 3d7781d · 3d7781d
1 parent 6063317
commit 3d7781d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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}