From c3a5141d41e52fa3296a693a33405787b59fd464 Mon Sep 17 00:00:00 2001
From: Paul Rogers <129207811+paul1r@users.noreply.github.com>
Date: Mon, 12 Aug 2024 09:29:19 -0400
Subject: [PATCH] chore: Update loki build image to go 1.22.6 (#13857)

---
 .drone/drone.yml                       | 6 +++---
 .github/workflows/check.yml            | 2 +-
 .github/workflows/minor-release-pr.yml | 4 ++--
 .github/workflows/patch-release-pr.yml | 4 ++--
 Makefile                               | 4 ++--
 loki-build-image/README.md             | 4 ++++
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.drone/drone.yml b/.drone/drone.yml
index d2be4bdb369b8..3710a4b9d3dda 100644
--- a/.drone/drone.yml
+++ b/.drone/drone.yml
@@ -139,7 +139,7 @@ steps:
   depends_on:
   - clone
   environment: {}
-  image: grafana/loki-build-image:0.33.5
+  image: grafana/loki-build-image:0.33.6
   name: documentation-helm-reference-check
 trigger:
   ref:
@@ -1085,7 +1085,7 @@ steps:
       from_secret: docker_password
     DOCKER_USERNAME:
       from_secret: docker_username
-  image: grafana/loki-build-image:0.33.5
+  image: grafana/loki-build-image:0.33.6
   name: build and push
   privileged: true
   volumes:
@@ -1308,6 +1308,6 @@ kind: secret
 name: gpg_private_key
 ---
 kind: signature
-hmac: 8a2db8460244184bb92d99cfe9a366e0a1cce91034cfe3784436a2f178b976c7
+hmac: 3b3b039769ab8c44318749efec569ffe50c4cfb173f577422ec9d514054f0a9e
 
 ...
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 12299b8cfbab5..8e63a1e5d9bae 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -2,7 +2,7 @@
   "check":
     "uses": "grafana/loki-release/.github/workflows/check.yml@main"
     "with":
-      "build_image": "grafana/loki-build-image:0.33.5"
+      "build_image": "grafana/loki-build-image:0.33.6"
       "golang_ci_lint_version": "v1.55.1"
       "release_lib_ref": "main"
       "skip_validation": false
diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml
index 0d5b261e6f464..74c00fdf23c44 100644
--- a/.github/workflows/minor-release-pr.yml
+++ b/.github/workflows/minor-release-pr.yml
@@ -16,7 +16,7 @@ jobs:
   check:
     uses: "grafana/loki-release/.github/workflows/check.yml@main"
     with:
-      build_image: "grafana/loki-build-image:0.33.5"
+      build_image: "grafana/loki-build-image:0.33.6"
       golang_ci_lint_version: "v1.55.1"
       release_lib_ref: "main"
       skip_validation: false
@@ -143,7 +143,7 @@ jobs:
           --env SKIP_ARM \
           --volume .:/src/loki \
           --workdir /src/loki \
-          --entrypoint /bin/sh "grafana/loki-build-image:0.33.5"
+          --entrypoint /bin/sh "grafana/loki-build-image:0.33.6"
           git config --global --add safe.directory /src/loki
           echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
           make dist packages
diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml
index 5fe2e39d6ce98..0a62fa1c9228e 100644
--- a/.github/workflows/patch-release-pr.yml
+++ b/.github/workflows/patch-release-pr.yml
@@ -16,7 +16,7 @@ jobs:
   check:
     uses: "grafana/loki-release/.github/workflows/check.yml@main"
     with:
-      build_image: "grafana/loki-build-image:0.33.5"
+      build_image: "grafana/loki-build-image:0.33.6"
       golang_ci_lint_version: "v1.55.1"
       release_lib_ref: "main"
       skip_validation: false
@@ -143,7 +143,7 @@ jobs:
           --env SKIP_ARM \
           --volume .:/src/loki \
           --workdir /src/loki \
-          --entrypoint /bin/sh "grafana/loki-build-image:0.33.5"
+          --entrypoint /bin/sh "grafana/loki-build-image:0.33.6"
           git config --global --add safe.directory /src/loki
           echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
           make dist packages
diff --git a/Makefile b/Makefile
index ccca8ba5ee3b8..0c551dd0c7ba2 100644
--- a/Makefile
+++ b/Makefile
@@ -37,8 +37,8 @@ DOCKER_IMAGE_DIRS := $(patsubst %/Dockerfile,%,$(DOCKERFILES))
 BUILD_IN_CONTAINER ?= true
 
 # ensure you run `make drone` and `make release-workflows` after changing this
-BUILD_IMAGE_VERSION ?= 0.33.5
-GO_VERSION := 1.22.5
+BUILD_IMAGE_VERSION ?= 0.33.6
+GO_VERSION := 1.22.6
 
 # Docker image info
 IMAGE_PREFIX ?= grafana
diff --git a/loki-build-image/README.md b/loki-build-image/README.md
index 37769c9411cee..81bb708871f12 100644
--- a/loki-build-image/README.md
+++ b/loki-build-image/README.md
@@ -2,6 +2,10 @@
 
 ## Versions
 
+### 0.33.6
+
+- Update to go 1.22.6
+
 ### 0.33.5
 
 - Update to alpine 3.20.2