remove GOTOOLCHAIN env-vars

Both containerd and runc have been a module for some time now, and all the branches we care about are a module, so there's no need to set the GO111MODULE env-var. Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah · Jun 11, 2024 · 9f2a5d2 · 9f2a5d2
1 parent 4a7ae12
commit 9f2a5d2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/debian/rules b/debian/rules
@@ -32,7 +32,7 @@ endif
 # TODO remove custom PREFIX variable once containerd release/1.4 and release/1.5
 #      are obsolete. See https://github.com/containerd/containerd/commit/b5f530a157
 binaries: ## Create containerd binaries
-	@set -x; GO111MODULE=auto make -C $(GO_SRC_PATH) --no-print-directory \
+	@set -x; make -C $(GO_SRC_PATH) --no-print-directory \
 		DESTDIR="$$(pwd)" \
 		PREFIX="" \
 		VERSION=$${VERSION} \
@@ -44,12 +44,12 @@ binaries: ## Create containerd binaries
 	rm -f bin/containerd-stress
 
 bin/runc:
-	@set -x; GO111MODULE=auto make -C /go/src/github.com/opencontainers/runc  --no-print-directory \
+	@set -x; make -C /go/src/github.com/opencontainers/runc  --no-print-directory \
 		BINDIR="$$(pwd)/bin" \
 		runc install
 
 man: ## Create containerd man pages
-	@set -x; GO111MODULE=auto make -C $(GO_SRC_PATH) --no-print-directory man
+	@set -x; make -C $(GO_SRC_PATH) --no-print-directory man
 
 	# copy the generated man pages instead of using "make install-man" to allow
 	# dh_installman doing its magic

diff --git a/dockerfiles/deb.dockerfile b/dockerfiles/deb.dockerfile
@@ -24,7 +24,6 @@ FROM ${GOLANG_IMAGE} AS golang
 
 FROM golang AS go-md2man
 ARG GOPROXY=direct
-ARG GO111MODULE=on
 ENV GOTOOLCHAIN=local
 ARG MD2MAN_VERSION=v2.0.1
 RUN go install github.com/cpuguy83/go-md2man/v2@${MD2MAN_VERSION}

diff --git a/dockerfiles/rpm.dockerfile b/dockerfiles/rpm.dockerfile
@@ -25,7 +25,6 @@ FROM ${GOLANG_IMAGE} AS golang
 
 FROM golang AS go-md2man
 ARG GOPROXY=direct
-ARG GO111MODULE=on
 ENV GOTOOLCHAIN=local
 ARG MD2MAN_VERSION=v2.0.1
 RUN go install github.com/cpuguy83/go-md2man/v2@${MD2MAN_VERSION}

diff --git a/dockerfiles/win.dockerfile b/dockerfiles/win.dockerfile
@@ -14,9 +14,7 @@
 
 ARG GOLANG_IMAGE=golang:latest
 FROM ${GOLANG_IMAGE} AS golang
-ARG GO111MODULE=auto
-ENV GO111MODULE=$GO111MODULE \
-    GOTOOLCHAIN=local \
+ENV GOTOOLCHAIN=local \
     chocolateyUseWindowsCompression=false
 # Install make and gcc
 # We install an older version of MinGW to workaround issues in CGO;

diff --git a/rpm/containerd.spec b/rpm/containerd.spec
@@ -113,7 +113,7 @@ cd %{_topdir}/BUILD/
 
 %build
 cd %{_topdir}/BUILD
-GO111MODULE=auto make man
+make man
 
 BUILDTAGS=""
 %if %{defined rhel} && 0%{?rhel} >= 8
@@ -128,14 +128,14 @@ BUILDTAGS="${BUILDTAGS} no_btrfs"
 %endif
 %endif
 
-GO111MODULE=auto make -C /go/src/%{import_path} VERSION=%{getenv:VERSION} REVISION=%{getenv:REF} PACKAGE=%{getenv:PACKAGE} BUILDTAGS="${BUILDTAGS}"
+make -C /go/src/%{import_path} VERSION=%{getenv:VERSION} REVISION=%{getenv:REF} PACKAGE=%{getenv:PACKAGE} BUILDTAGS="${BUILDTAGS}"
 
 # Remove containerd-stress, as we're not shipping it as part of the packages
 rm -f bin/containerd-stress
 bin/containerd --version
 bin/ctr --version
 
-GO111MODULE=auto make -C /go/src/github.com/opencontainers/runc BINDIR=%{_topdir}/BUILD/bin runc install
+make -C /go/src/github.com/opencontainers/runc BINDIR=%{_topdir}/BUILD/bin runc install
 
 
 %install