blabla

thaJeztah · thaJeztah · commit ecd9beb538fb · 2021-07-28T19:59:58.000+02:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/Dockerfile b/Dockerfile
@@ -46,7 +46,7 @@ ARG GO_STRIP
 ARG CGO_ENABLED
 # VERSION sets the version for the produced binary
 ARG VERSION
-ARG GO111MODULE=off
+#ARG GO111MODULE=off
 RUN --mount=ro --mount=type=cache,target=/root/.cache \
     --mount=from=dockercore/golang-cross:xx-sdk-extras,target=/xx-sdk,src=/xx-sdk \
     --mount=type=tmpfs,target=cli/winresources \
@@ -56,7 +56,7 @@ RUN --mount=ro --mount=type=cache,target=/root/.cache \
     xx-verify $([ "$GO_LINKMODE" = "static" ] && echo "--static") /out/docker
 
 FROM build-base-${BASE_VARIANT} AS dev 
-ENV GO111MODULE=off
+#ENV GO111MODULE=off
 COPY . .
 
 FROM scratch AS binary
diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev
@@ -3,7 +3,7 @@
 ARG GO_VERSION=1.16.6
 
 FROM golang:${GO_VERSION}-alpine AS golang
-ENV CGO_ENABLED=0
+ENV  CGO_ENABLED=0
 
 FROM golang AS esc
 ARG ESC_VERSION=v0.2.0
diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e
@@ -39,7 +39,7 @@ ARG GITCOMMIT
 ENV VERSION=${VERSION}
 ENV GITCOMMIT=${GITCOMMIT}
 ENV DOCKER_BUILDKIT=1
-ENV GO111MODULE=off
+#ENV GO111MODULE=off
 RUN ./scripts/build/binary
 RUN ./scripts/build/plugins e2e/cli-plugins/plugins/*
 
diff --git a/scripts/build/binary b/scripts/build/binary
@@ -76,7 +76,7 @@ fi
 
 echo "Building $GO_LINKMODE $(basename "${TARGET}")"
 
-export GO111MODULE=off
+export GO111MODULE=auto
 
 go build -o "${TARGET}" -tags "${GO_BUILDTAGS}" --ldflags "${LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}"
 
diff --git a/scripts/build/plugins b/scripts/build/plugins
@@ -17,5 +17,5 @@ for p in cli-plugins/examples/* "$@" ; do
 
     echo "Building statically linked $TARGET"
     export CGO_ENABLED=0
-    go build -o "${TARGET}" --ldflags "${LDFLAGS}" "github.com/docker/cli/${p}"
+    GO111MODULE=auto go build -o "${TARGET}" --ldflags "${LDFLAGS}" "github.com/docker/cli/${p}"
 done
