From dc175c09fd68aee12ca0752f83aff16a7a51fef2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 4 Sep 2024 12:37:42 +0200 Subject: [PATCH] rpm: fix missing GOTOOLCHAIN=local in centos, rhel Dockerfiles Commit a4090a0e198517b9e7603db375a283c3df3ec4f7 added GOTOOLCHAIN=local, but for some reason missed the centos Dockerfiles. The env-var is set to make sure we don't get unexpected updates of the go toolchain when building. We need to set this env-var, because we're not using the official golang image as base-image, but instead copy the binaries into a distro-image. This patch adds the missing GOTOOLCHAIN env-vars. Signed-off-by: Sebastiaan van Stijn --- rpm/centos-9/Dockerfile | 1 + rpm/rhel-8/Dockerfile | 1 + rpm/rhel-9/Dockerfile | 1 + 3 files changed, 3 insertions(+) diff --git a/rpm/centos-9/Dockerfile b/rpm/centos-9/Dockerfile index dac7dfd030..577002c394 100644 --- 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 index d1fb559de7..d4b120cf97 100644 --- 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 index af1b2d663e..526bf8bdbc 100644 --- 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