From ca2f11d93e07d6232504fd811c59415ddf3403c2 Mon Sep 17 00:00:00 2001
From: Paul Rogers <129207811+paul1r@users.noreply.github.com>
Date: Wed, 3 Jul 2024 10:26:13 -0400
Subject: [PATCH] chore: Update Docker images to Go 1.22.5 (#13398)

---
 clients/cmd/fluent-bit/Dockerfile       | 2 +-
 clients/cmd/promtail/Dockerfile         | 2 +-
 clients/cmd/promtail/Dockerfile.arm32   | 2 +-
 cmd/logcli/Dockerfile                   | 2 +-
 cmd/logql-analyzer/Dockerfile           | 2 +-
 cmd/loki-canary-boringcrypto/Dockerfile | 2 +-
 cmd/loki-canary/Dockerfile              | 2 +-
 cmd/loki-canary/Dockerfile.cross        | 2 +-
 cmd/loki/Dockerfile                     | 2 +-
 cmd/loki/Dockerfile.cross               | 2 +-
 cmd/loki/Dockerfile.debug               | 2 +-
 cmd/migrate/Dockerfile                  | 2 +-
 cmd/querytee/Dockerfile                 | 2 +-
 cmd/querytee/Dockerfile.cross           | 2 +-
 tools/go-version-bump.sh                | 4 +---
 tools/lambda-promtail/Dockerfile        | 2 +-
 16 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/clients/cmd/fluent-bit/Dockerfile b/clients/cmd/fluent-bit/Dockerfile
index 19d0721d54..55e15b42e4 100644
--- a/clients/cmd/fluent-bit/Dockerfile
+++ b/clients/cmd/fluent-bit/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.2-bullseye AS builder
+FROM golang:1.22.5-bullseye AS builder
 
 COPY . /src
 
diff --git a/clients/cmd/promtail/Dockerfile b/clients/cmd/promtail/Dockerfile
index c18b96ddcc..0ac16613ea 100644
--- a/clients/cmd/promtail/Dockerfile
+++ b/clients/cmd/promtail/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.2-bookworm as build
+FROM golang:1.22.5-bookworm as build
 
 COPY . /src/loki
 WORKDIR /src/loki
diff --git a/clients/cmd/promtail/Dockerfile.arm32 b/clients/cmd/promtail/Dockerfile.arm32
index 8724b1ff58..fc92f85282 100644
--- a/clients/cmd/promtail/Dockerfile.arm32
+++ b/clients/cmd/promtail/Dockerfile.arm32
@@ -1,4 +1,4 @@
-FROM golang:1.22.2-bookworm as build
+FROM golang:1.22.5-bookworm as build
 
 COPY . /src/loki
 WORKDIR /src/loki
diff --git a/cmd/logcli/Dockerfile b/cmd/logcli/Dockerfile
index 9eaf3dda8f..ffcbef10ec 100644
--- a/cmd/logcli/Dockerfile
+++ b/cmd/logcli/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.2 as build
+FROM golang:1.22.5 as build
 
 COPY . /src/loki
 WORKDIR /src/loki
diff --git a/cmd/logql-analyzer/Dockerfile b/cmd/logql-analyzer/Dockerfile
index abfbbe0c88..4908bbb7da 100644
--- a/cmd/logql-analyzer/Dockerfile
+++ b/cmd/logql-analyzer/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.2 as build
+FROM golang:1.22.5 as build
 
 COPY . /src/loki
 WORKDIR /src/loki
diff --git a/cmd/loki-canary-boringcrypto/Dockerfile b/cmd/loki-canary-boringcrypto/Dockerfile
index 932f70b500..c1217cc3f6 100644
--- a/cmd/loki-canary-boringcrypto/Dockerfile
+++ b/cmd/loki-canary-boringcrypto/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.2 as build
+FROM golang:1.22.5 as build
 
 COPY . /src/loki
 WORKDIR /src/loki
diff --git a/cmd/loki-canary/Dockerfile b/cmd/loki-canary/Dockerfile
index 930c0f3bb1..cf0f60c695 100644
--- a/cmd/loki-canary/Dockerfile
+++ b/cmd/loki-canary/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.2 as build
+FROM golang:1.22.5 as build
 
 COPY . /src/loki
 WORKDIR /src/loki
diff --git a/cmd/loki-canary/Dockerfile.cross b/cmd/loki-canary/Dockerfile.cross
index 782cb32663..b56f292e55 100644
--- a/cmd/loki-canary/Dockerfile.cross
+++ b/cmd/loki-canary/Dockerfile.cross
@@ -2,7 +2,7 @@ ARG BUILD_IMAGE=grafana/loki-build-image:0.33.4
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t grafana/promtail -f cmd/promtail/Dockerfile .
-FROM golang:1.22.2-alpine as goenv
+FROM golang:1.22.5-alpine as goenv
 RUN go env GOARCH > /goarch && \
   go env GOARM > /goarm
 
diff --git a/cmd/loki/Dockerfile b/cmd/loki/Dockerfile
index ed85213b0d..6052f41ca5 100644
--- a/cmd/loki/Dockerfile
+++ b/cmd/loki/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.2 as build
+FROM golang:1.22.5 as build
 
 COPY . /src/loki
 WORKDIR /src/loki
diff --git a/cmd/loki/Dockerfile.cross b/cmd/loki/Dockerfile.cross
index e0997b3557..52b18a302b 100644
--- a/cmd/loki/Dockerfile.cross
+++ b/cmd/loki/Dockerfile.cross
@@ -2,7 +2,7 @@ ARG BUILD_IMAGE=grafana/loki-build-image:0.33.4
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t grafana/loki -f cmd/loki/Dockerfile .
-FROM golang:1.22.2-alpine as goenv
+FROM golang:1.22.5-alpine as goenv
 RUN go env GOARCH > /goarch && \
     go env GOARM > /goarm
 
diff --git a/cmd/loki/Dockerfile.debug b/cmd/loki/Dockerfile.debug
index 5ee5f2a065..a943cb57f0 100644
--- a/cmd/loki/Dockerfile.debug
+++ b/cmd/loki/Dockerfile.debug
@@ -3,7 +3,7 @@ ARG BUILD_IMAGE=grafana/loki-build-image:0.33.4
 # This file is intended to be called from the root like so:
 # docker build -t grafana/loki -f cmd/loki/Dockerfile.debug .
 
-FROM golang:1.22.2-alpine as goenv
+FROM golang:1.22.5-alpine as goenv
 RUN go env GOARCH > /goarch && \
     go env GOARM > /goarm && \
     go install github.com/go-delve/delve/cmd/dlv@latest
diff --git a/cmd/migrate/Dockerfile b/cmd/migrate/Dockerfile
index 91861fa718..e50554d50d 100644
--- a/cmd/migrate/Dockerfile
+++ b/cmd/migrate/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.2 as build
+FROM golang:1.22.5 as build
 COPY . /src/loki
 WORKDIR /src/loki
 RUN make clean && make BUILD_IN_CONTAINER=false migrate
diff --git a/cmd/querytee/Dockerfile b/cmd/querytee/Dockerfile
index 77be07225f..f2bfcefa02 100644
--- a/cmd/querytee/Dockerfile
+++ b/cmd/querytee/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.2 as build
+FROM golang:1.22.5 as build
 
 COPY . /src/loki
 WORKDIR /src/loki
diff --git a/cmd/querytee/Dockerfile.cross b/cmd/querytee/Dockerfile.cross
index c3299ace8d..005ebabbc2 100644
--- a/cmd/querytee/Dockerfile.cross
+++ b/cmd/querytee/Dockerfile.cross
@@ -2,7 +2,7 @@ ARG BUILD_IMAGE=grafana/loki-build-image:0.33.4
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t grafana/promtail -f cmd/promtail/Dockerfile .
-FROM golang:1.22.2-alpine as goenv
+FROM golang:1.22.5-alpine as goenv
 RUN go env GOARCH > /goarch && \
   go env GOARM > /goarm
 
diff --git a/tools/go-version-bump.sh b/tools/go-version-bump.sh
index 370704e73b..c6585c1f53 100755
--- a/tools/go-version-bump.sh
+++ b/tools/go-version-bump.sh
@@ -23,6 +23,4 @@ find cmd clients tools loki-build-image -type f -name 'Dockerfile*' -exec grep -
   while read -r x; do
     echo "Updating ${x}"
     ${SED} -i -re "s,golang:[0-9\.]+,golang:${VERSION},g" "${x}"
-  done
-
-echo "Don't forget to update the sha256 hash in clients/cmd/fluent-bit/Dockerfile."
+  done
\ No newline at end of file
diff --git a/tools/lambda-promtail/Dockerfile b/tools/lambda-promtail/Dockerfile
index 4cb51bcbe8..b732fb8b90 100644
--- a/tools/lambda-promtail/Dockerfile
+++ b/tools/lambda-promtail/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.2-alpine AS build-image
+FROM golang:1.22.5-alpine AS build-image
 
 COPY tools/lambda-promtail /src/lambda-promtail
 WORKDIR /src/lambda-promtail