diff --git a/Makefile b/Makefile index b9449530424..4d92126e78b 100644 --- a/Makefile +++ b/Makefile @@ -245,7 +245,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 ?= pr10481-6c395eeace +LATEST_BUILD_IMAGE_TAG ?= pr10708-6841577474 # 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 index cf2ad821532..ed7fee5ad7e 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ module github.com/grafana/mimir -go 1.22.7 +go 1.22.11 // Please note that this directive is ignored when building with the Mimir build image, // that will always use its bundled toolchain. -toolchain go1.23.3 +toolchain go1.23.6 require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.5.0 diff --git a/mimir-build-image/Dockerfile b/mimir-build-image/Dockerfile index eb524496423..7fe6374d883 100644 --- a/mimir-build-image/Dockerfile +++ b/mimir-build-image/Dockerfile @@ -5,7 +5,7 @@ FROM registry.k8s.io/kustomize/kustomize:v5.4.3 as kustomize FROM alpine/helm:3.14.4 as helm -FROM golang:1.23.5-bookworm +FROM golang:1.23.6-bookworm ARG goproxyValue ENV GOPROXY=${goproxyValue} ENV SKOPEO_DEPS="libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config"