From e58467666b1c55701b3f1801732ded1fe6e7ddcc Mon Sep 17 00:00:00 2001
From: Patryk Prus <patryk@grafana.com>
Date: Thu, 7 Mar 2024 05:32:33 -0500
Subject: [PATCH] chore(deps): update golang docker tag to v1.21.8 (main)
 (#7557)

* chore(deps): update golang docker tag to v1.21.8 (main)

* Update build image version to pr7557-ae15c572b6

* Trigger CI

---------

Co-authored-by: pr00se <pr00se@users.noreply.github.com>
Co-authored-by: Yuri Nikolic <durica.nikolic@grafana.com>
(cherry picked from commit e0a86e6c54e6467b27c638e1655fec5a7fc4d658)
---
 Makefile                     | 2 +-
 mimir-build-image/Dockerfile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 68fbdf2df7..83ee453023 100644
--- a/Makefile
+++ b/Makefile
@@ -242,7 +242,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 ?= pr7417-94e502bf74
+LATEST_BUILD_IMAGE_TAG ?= pr7557-ae15c572b6
 
 # 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/mimir-build-image/Dockerfile b/mimir-build-image/Dockerfile
index 7438c979b5..c0f28d7c6c 100644
--- a/mimir-build-image/Dockerfile
+++ b/mimir-build-image/Dockerfile
@@ -4,8 +4,8 @@
 # Provenance-includes-copyright: The Cortex Authors.
 
 FROM registry.k8s.io/kustomize/kustomize:v5.3.0 as kustomize
-FROM alpine/helm:3.14.1 as helm
-FROM golang:1.21.6-bookworm
+FROM alpine/helm:3.14.2 as helm
+FROM golang:1.21.8-bookworm
 ARG goproxyValue
 ENV GOPROXY=${goproxyValue}
 ENV SKOPEO_DEPS="libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config"