Skip to content

K
k3s
Commit 3d7781df authored by Darren Shepherd's avatar Darren Shepherd
Browse files
Options

Disable go modules only in dapper, not always

parent 60633171
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
Dockerfile.dapper
View file @ 3d7781df
...@@ -24,6 +24,7 @@ RUN if [ "$DQLITE" = true ]; then \ ...@@ -24,6 +24,7 @@ RUN if [ "$DQLITE" = true ]; then \
apk add --allow-untrusted /usr/local/packages/*.apk \ apk add --allow-untrusted /usr/local/packages/*.apk \
;fi ;fi
ENV GO111MODULE off
ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/rancher/k3s/.cache 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_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE
ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/ ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/
......
scripts/build
View file @ 3d7781df
...@@ -10,8 +10,6 @@ PKG_CONTAINERD="github.com/containerd/containerd" ...@@ -10,8 +10,6 @@ PKG_CONTAINERD="github.com/containerd/containerd"
PKG_RANCHER_CONTAINERD="github.com/rancher/containerd" PKG_RANCHER_CONTAINERD="github.com/rancher/containerd"
PKG_CRICTL="github.com/kubernetes-sigs/cri-tools" PKG_CRICTL="github.com/kubernetes-sigs/cri-tools"
export GO111MODULE=off
VENDOR_PREFIX="${PKG}/vendor/" VENDOR_PREFIX="${PKG}/vendor/"
VERSIONFLAGS=" VERSIONFLAGS="
-X ${PKG}/pkg/version.Version=${VERSION} -X ${PKG}/pkg/version.Version=${VERSION}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment