From 7edf5ce74eee7ff2fb543929212aa447aa9b4c61 Mon Sep 17 00:00:00 2001
From: prombot <prometheus-team@googlegroups.com>
Date: Wed, 10 Jan 2024 12:11:51 +0000
Subject: [PATCH] Bump Go version

Signed-off-by: prombot <prometheus-team@googlegroups.com>
---
 1.20/Makefile.COMMON |  2 +-
 1.20/base/Dockerfile |  4 ++--
 1.21/Makefile.COMMON |  2 +-
 1.21/base/Dockerfile |  4 ++--
 README.md            | 20 ++++++++++----------
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/1.20/Makefile.COMMON b/1.20/Makefile.COMMON
index 321c58f..ee3c68c 100644
--- a/1.20/Makefile.COMMON
+++ b/1.20/Makefile.COMMON
@@ -15,7 +15,7 @@ REPOSITORY    := quay.io/prometheus
 NAME          := golang-builder
 BRANCH        := $(shell git rev-parse --abbrev-ref HEAD)
 SUFFIX        ?= -$(subst /,-,$(BRANCH))
-VERSION       := 1.20.12
+VERSION       := 1.20.13
 DIRNAME       := $(shell basename $(CURDIR))
 IMAGE_DIR     ?= .build
 IMAGE         := $(REPOSITORY)/$(NAME)
diff --git a/1.20/base/Dockerfile b/1.20/base/Dockerfile
index dfb23b8..7ce964f 100644
--- a/1.20/base/Dockerfile
+++ b/1.20/base/Dockerfile
@@ -35,9 +35,9 @@ RUN \
         && chmod  0755 /bin/yq \
         && rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION 1.20.12
+ENV GOLANG_VERSION 1.20.13
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256 9c5d48c54dd8b0a3b2ef91b0f92a1190aa01f11d26e98033efa64c46a30bba7b
+ENV GOLANG_DOWNLOAD_SHA256 9a9d3dcae2b6a638b1f2e9bd4db08ffb39c10e55d9696914002742d90f0047b5
 
 RUN go_file=$(/bin/download.sh ${GOLANG_DOWNLOAD_URL} ${GOLANG_DOWNLOAD_SHA256}) \
     && tar -C /usr/local -xzf ${go_file} \
diff --git a/1.21/Makefile.COMMON b/1.21/Makefile.COMMON
index 16f48be..13a2b42 100644
--- a/1.21/Makefile.COMMON
+++ b/1.21/Makefile.COMMON
@@ -15,7 +15,7 @@ REPOSITORY    := quay.io/prometheus
 NAME          := golang-builder
 BRANCH        := $(shell git rev-parse --abbrev-ref HEAD)
 SUFFIX        ?= -$(subst /,-,$(BRANCH))
-VERSION       := 1.21.5
+VERSION       := 1.21.6
 DIRNAME       := $(shell basename $(CURDIR))
 IMAGE_DIR     ?= .build
 IMAGE         := $(REPOSITORY)/$(NAME)
diff --git a/1.21/base/Dockerfile b/1.21/base/Dockerfile
index 19a69a9..2498df9 100644
--- a/1.21/base/Dockerfile
+++ b/1.21/base/Dockerfile
@@ -35,9 +35,9 @@ RUN \
         && chmod  0755 /bin/yq \
         && rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION 1.21.5
+ENV GOLANG_VERSION 1.21.6
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256 e2bc0b3e4b64111ec117295c088bde5f00eeed1567999ff77bc859d7df70078e
+ENV GOLANG_DOWNLOAD_SHA256 3f934f40ac360b9c01f616a9aa1796d227d8b0328bf64cb045c7b8c4ee9caea4
 
 RUN go_file=$(/bin/download.sh ${GOLANG_DOWNLOAD_URL} ${GOLANG_DOWNLOAD_SHA256}) \
     && tar -C /usr/local -xzf ${go_file} \
diff --git a/README.md b/README.md
index 2ea2e81..af97d29 100644
--- a/README.md
+++ b/README.md
@@ -7,16 +7,16 @@
 
 Docker Builder Image for cross-building Golang Prometheus projects.
 
-- `latest`, `main`, `1.21.5-main`, `1.21.5-main` ([1.21.5/main/Dockerfile](1.21.5/main/Dockerfile))
-- `arm`, `1.21.5-arm`, `1.21.5-arm` ([1.21.5/arm/Dockerfile](1.21.5/arm/Dockerfile))
-- `powerpc`, `1.21.5-powerpc`, `1.21.5-powerpc` ([1.21.5/powerpc/Dockerfile](1.21.5/powerpc/Dockerfile))
-- `mips`, `1.21.5-mips`, `1.21.5-mips` ([1.21.5/mips/Dockerfile](1.21.5/mips/Dockerfile))
-- `s390x`, `1.21.5-s390x`, `1.21.5-s390x` ([1.21.5/s390x/Dockerfile](1.21.5/s390x/Dockerfile))
-- `1.20-main`, `1.20.12-main` ([1.20/main/Dockerfile](1.20/main/Dockerfile))
-- `arm`, `1.20-arm`, `1.20.12-arm` ([1.20/arm/Dockerfile](1.20/arm/Dockerfile))
-- `powerpc`, `1.20-powerpc`, `1.20.12-powerpc` ([1.20/powerpc/Dockerfile](1.20/powerpc/Dockerfile))
-- `mips`, `1.20-mips`, `1.20.12-mips` ([1.20/mips/Dockerfile](1.20/mips/Dockerfile))
-- `s390x`, `1.20-s390x`, `1.20.12-s390x` ([1.20/s390x/Dockerfile](1.20/s390x/Dockerfile))
+- `latest`, `main`, `1.21.6-main`, `1.21.6-main` ([1.21.6/main/Dockerfile](1.21.6/main/Dockerfile))
+- `arm`, `1.21.6-arm`, `1.21.6-arm` ([1.21.6/arm/Dockerfile](1.21.6/arm/Dockerfile))
+- `powerpc`, `1.21.6-powerpc`, `1.21.6-powerpc` ([1.21.6/powerpc/Dockerfile](1.21.6/powerpc/Dockerfile))
+- `mips`, `1.21.6-mips`, `1.21.6-mips` ([1.21.6/mips/Dockerfile](1.21.6/mips/Dockerfile))
+- `s390x`, `1.21.6-s390x`, `1.21.6-s390x` ([1.21.6/s390x/Dockerfile](1.21.6/s390x/Dockerfile))
+- `1.20-main`, `1.20.13-main` ([1.20/main/Dockerfile](1.20/main/Dockerfile))
+- `arm`, `1.20-arm`, `1.20.13-arm` ([1.20/arm/Dockerfile](1.20/arm/Dockerfile))
+- `powerpc`, `1.20-powerpc`, `1.20.13-powerpc` ([1.20/powerpc/Dockerfile](1.20/powerpc/Dockerfile))
+- `mips`, `1.20-mips`, `1.20.13-mips` ([1.20/mips/Dockerfile](1.20/mips/Dockerfile))
+- `s390x`, `1.20-s390x`, `1.20.13-s390x` ([1.20/s390x/Dockerfile](1.20/s390x/Dockerfile))
 
 ## Usage