Merge pull request #264 from prometheus/bump_version

Bump Go version
prometheus · Jun 5, 2024 · 3f1b36c · 3f1b36c
2 parents 070cd7a + 54eda16
commit 3f1b36c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git 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.10
+VERSION       := 1.21.11
 DIRNAME       := $(shell basename $(CURDIR))
 IMAGE_DIR     ?= .build
 IMAGE         := $(REPOSITORY)/$(NAME)

diff --git 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.10
+ENV GOLANG_VERSION 1.21.11
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256 e330e5d977bf4f3bdc157bc46cf41afa5b13d66c914e12fd6b694ccda65fcf92
+ENV GOLANG_DOWNLOAD_SHA256 54a87a9325155b98c85bc04dc50298ddd682489eb47f486f2e6cb0707554abf0
 
 RUN go_file=$(/bin/download.sh ${GOLANG_DOWNLOAD_URL} ${GOLANG_DOWNLOAD_SHA256}) \
     && tar -C /usr/local -xzf ${go_file} \

diff --git a/1.22/Makefile.COMMON b/1.22/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.22.3
+VERSION       := 1.22.4
 DIRNAME       := $(shell basename $(CURDIR))
 IMAGE_DIR     ?= .build
 IMAGE         := $(REPOSITORY)/$(NAME)

diff --git a/1.22/base/Dockerfile b/1.22/base/Dockerfile
@@ -35,9 +35,9 @@ RUN \
         && chmod  0755 /bin/yq \
         && rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION 1.22.3
+ENV GOLANG_VERSION 1.22.4
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256 8920ea521bad8f6b7bc377b4824982e011c19af27df88a815e3586ea895f1b36
+ENV GOLANG_DOWNLOAD_SHA256 ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d
 
 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
@@ -7,16 +7,16 @@
 
 Docker Builder Image for cross-building Golang Prometheus projects.
 
-- `latest`, `main`, `1.22.3-main`, `1.22.3-main` ([1.22.3/main/Dockerfile](1.22.3/main/Dockerfile))
-- `arm`, `1.22.3-arm`, `1.22.3-arm` ([1.22.3/arm/Dockerfile](1.22.3/arm/Dockerfile))
-- `powerpc`, `1.22.3-powerpc`, `1.22.3-powerpc` ([1.22.3/powerpc/Dockerfile](1.22.3/powerpc/Dockerfile))
-- `mips`, `1.22.3-mips`, `1.22.3-mips` ([1.22.3/mips/Dockerfile](1.22.3/mips/Dockerfile))
-- `s390x`, `1.22.3-s390x`, `1.22.3-s390x` ([1.22.3/s390x/Dockerfile](1.22.3/s390x/Dockerfile))
-- `1.21-main`, `1.21.10-main` ([1.21/main/Dockerfile](1.21/main/Dockerfile))
-- `arm`, `1.21-arm`, `1.21.10-arm` ([1.21/arm/Dockerfile](1.21/arm/Dockerfile))
-- `powerpc`, `1.21-powerpc`, `1.21.10-powerpc` ([1.21/powerpc/Dockerfile](1.21/powerpc/Dockerfile))
-- `mips`, `1.21-mips`, `1.21.10-mips` ([1.21/mips/Dockerfile](1.21/mips/Dockerfile))
-- `s390x`, `1.21-s390x`, `1.21.10-s390x` ([1.21/s390x/Dockerfile](1.21/s390x/Dockerfile))
+- `latest`, `main`, `1.22.4-main`, `1.22.4-main` ([1.22.4/main/Dockerfile](1.22.4/main/Dockerfile))
+- `arm`, `1.22.4-arm`, `1.22.4-arm` ([1.22.4/arm/Dockerfile](1.22.4/arm/Dockerfile))
+- `powerpc`, `1.22.4-powerpc`, `1.22.4-powerpc` ([1.22.4/powerpc/Dockerfile](1.22.4/powerpc/Dockerfile))
+- `mips`, `1.22.4-mips`, `1.22.4-mips` ([1.22.4/mips/Dockerfile](1.22.4/mips/Dockerfile))
+- `s390x`, `1.22.4-s390x`, `1.22.4-s390x` ([1.22.4/s390x/Dockerfile](1.22.4/s390x/Dockerfile))
+- `1.21-main`, `1.21.11-main` ([1.21/main/Dockerfile](1.21/main/Dockerfile))
+- `arm`, `1.21-arm`, `1.21.11-arm` ([1.21/arm/Dockerfile](1.21/arm/Dockerfile))
+- `powerpc`, `1.21-powerpc`, `1.21.11-powerpc` ([1.21/powerpc/Dockerfile](1.21/powerpc/Dockerfile))
+- `mips`, `1.21-mips`, `1.21.11-mips` ([1.21/mips/Dockerfile](1.21/mips/Dockerfile))
+- `s390x`, `1.21-s390x`, `1.21.11-s390x` ([1.21/s390x/Dockerfile](1.21/s390x/Dockerfile))
 
 ## Usage