Merge pull request #1062 from thaJeztah/fix_gotoolchain_env

vvoland · web-flow · commit 462b265a5522 · 2024-09-04T11:34:06.000Z
[master] rpm: fix missing GOTOOLCHAIN=local in centos, rhel Dockerfiles
diff --git a/rpm/centos-9/Dockerfile b/rpm/centos-9/Dockerfile
@@ -11,6 +11,7 @@ FROM ${BUILD_IMAGE}
 ENV GOPROXY=https://proxy.golang.org|direct
 ENV GO111MODULE=off
 ENV GOPATH=/go
+ENV GOTOOLCHAIN=local
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
 ENV DOCKER_BUILDTAGS exclude_graphdriver_btrfs
diff --git a/rpm/rhel-8/Dockerfile b/rpm/rhel-8/Dockerfile
@@ -28,6 +28,7 @@ FROM subscribed-image
 ENV GOPROXY=https://proxy.golang.org|direct
 ENV GO111MODULE=off
 ENV GOPATH=/go
+ENV GOTOOLCHAIN=local
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
 ENV DOCKER_BUILDTAGS exclude_graphdriver_btrfs
diff --git a/rpm/rhel-9/Dockerfile b/rpm/rhel-9/Dockerfile
@@ -28,6 +28,7 @@ FROM subscribed-image
 ENV GOPROXY=https://proxy.golang.org|direct
 ENV GO111MODULE=off
 ENV GOPATH=/go
+ENV GOTOOLCHAIN=local
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
 ENV DOCKER_BUILDTAGS exclude_graphdriver_btrfs
