mimir-build-image: Explicitly set GOTOOLCHAIN=local (#9082)

* mimir-build-image: Explicitly set GOTOOLCHAIN=local --------- Signed-off-by: Arve Knudsen <[email protected]> Co-authored-by: Vladimir Varankin <[email protected]> Co-authored-by: aknuds1 <[email protected]>
grafana · Aug 23, 2024 · 1dc7a07 · 1dc7a07
1 parent 20d847d
commit 1dc7a07
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -275,7 +275,7 @@ mimir-build-image/$(UPTODATE): mimir-build-image/*
 # All the boiler plate for building golang follows:
 SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
 BUILD_IN_CONTAINER ?= true
-LATEST_BUILD_IMAGE_TAG ?= pr8600-8a8fd767c7
+LATEST_BUILD_IMAGE_TAG ?= pr9082-d0a22a8a96
 
 # TTY is parameterized to allow Google Cloud Builder to run builds,
 # as it currently disallows TTY devices. This value needs to be overridden

diff --git a/go.mod b/go.mod
@@ -2,6 +2,8 @@ module github.com/grafana/mimir
 
 go 1.21.0
 
+// Please note that this directive is ignored when building with the Mimir build image,
+// that will always use its bundled toolchain.
 toolchain go1.22.5
 
 require (

diff --git a/mimir-build-image/Dockerfile b/mimir-build-image/Dockerfile
@@ -9,6 +9,10 @@ FROM golang:1.22.5-bookworm
 ARG goproxyValue
 ENV GOPROXY=${goproxyValue}
 ENV SKOPEO_DEPS="libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config"
+# Override toolchain directive in go.mod, to ensure the image's Go version is used.
+# Be aware that the official Go Dockerfiles already do this, but let's be explicit.
+# https://github.com/docker-library/golang/issues/472
+ENV GOTOOLCHAIN=local
 RUN apt-get update && apt-get install -y curl python3-requests python3-yaml file jq zip unzip protobuf-compiler libprotobuf-dev shellcheck libpcap-dev $SKOPEO_DEPS && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 RUN go install golang.org/x/tools/cmd/goimports@3fce476f0a782aeb5034d592c189e63be4ba6c9e