Merge pull request #1062 from thaJeztah/fix_gotoolchain_env

[master] rpm: fix missing GOTOOLCHAIN=local in centos, rhel Dockerfiles
docker · Sep 4, 2024 · 462b265 · 462b265
2 parents ec2c0b6 + dc175c0
commit 462b265
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
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