Bump Go version

Signed-off-by: prombot <[email protected]>
prometheus · Feb 15, 2024 · c20fd2f · c20fd2f
1 parent 6571a53
commit c20fd2f
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 17 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,7 +4,7 @@ version: 2.1
 executors:
   golang:
     docker:
-    - image: cimg/go:1.21
+    - image: cimg/go:1.22
   vm:
     machine:
       image: ubuntu-2204:current
@@ -59,8 +59,8 @@ workflows:
         matrix:
           parameters:
             version:
-            - "1.20"
             - "1.21"
+            - "1.22"
         filters:
           tags:
             only: /.*/

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

diff --git a/1.20/base/.dockerignore → 1.22/base/.dockerignore b/1.20/base/.dockerignore → 1.22/base/.dockerignore
diff --git a/1.20/base/Dockerfile → 1.22/base/Dockerfile b/1.20/base/Dockerfile → 1.22/base/Dockerfile
@@ -35,9 +35,9 @@ RUN \
         && chmod  0755 /bin/yq \
         && rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION 1.20.13
+ENV GOLANG_VERSION 1.22.0
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256 9a9d3dcae2b6a638b1f2e9bd4db08ffb39c10e55d9696914002742d90f0047b5
+ENV GOLANG_DOWNLOAD_SHA256 f6c8a87aa03b92c4b0bf3d558e28ea03006eb29db78917daec5cfb6ec1046265
 
 RUN go_file=$(/bin/download.sh ${GOLANG_DOWNLOAD_URL} ${GOLANG_DOWNLOAD_SHA256}) \
     && tar -C /usr/local -xzf ${go_file} \

diff --git a/1.20/base/Makefile → 1.22/base/Makefile b/1.20/base/Makefile → 1.22/base/Makefile
diff --git a/1.20/base/download.sh → 1.22/base/download.sh b/1.20/base/download.sh → 1.22/base/download.sh
diff --git a/1.20/base/rootfs/builder.sh → 1.22/base/rootfs/builder.sh b/1.20/base/rootfs/builder.sh → 1.22/base/rootfs/builder.sh
diff --git a/1.20/base/rootfs/common.sh → 1.22/base/rootfs/common.sh b/1.20/base/rootfs/common.sh → 1.22/base/rootfs/common.sh
diff --git a/1.20/main/.dockerignore → 1.22/main/.dockerignore b/1.20/main/.dockerignore → 1.22/main/.dockerignore
diff --git a/1.20/main/Dockerfile → 1.22/main/Dockerfile b/1.20/main/Dockerfile → 1.22/main/Dockerfile
@@ -2,7 +2,7 @@ FROM rust:latest as rustbuilder
 
 RUN cargo install --git https://github.com/indygreg/apple-platform-rs --branch main --bin rcodesign apple-codesign
 
-FROM        quay.io/prometheus/golang-builder:1.20-base
+FROM        quay.io/prometheus/golang-builder:1.22-base
 MAINTAINER  The Prometheus Authors <[email protected]>
 
 RUN \

diff --git a/1.20/main/Makefile → 1.22/main/Makefile b/1.20/main/Makefile → 1.22/main/Makefile
diff --git a/1.20/main/rootfs/builder.sh → 1.22/main/rootfs/builder.sh b/1.20/main/rootfs/builder.sh → 1.22/main/rootfs/builder.sh
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@
 REPOSITORY := quay.io/prometheus
 NAME       := golang-builder
 VARIANTS   ?= base main
-VERSION    ?= 1.21
+VERSION    ?= 1.22
 
 all: build
 

diff --git a/README.md b/README.md
@@ -7,16 +7,16 @@
 
 Docker Builder Image for cross-building Golang Prometheus projects.
 
-- `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))
+- `latest`, `main`, `1.22.0-main`, `1.22.0-main` ([1.22.0/main/Dockerfile](1.22.0/main/Dockerfile))
+- `arm`, `1.22.0-arm`, `1.22.0-arm` ([1.22.0/arm/Dockerfile](1.22.0/arm/Dockerfile))
+- `powerpc`, `1.22.0-powerpc`, `1.22.0-powerpc` ([1.22.0/powerpc/Dockerfile](1.22.0/powerpc/Dockerfile))
+- `mips`, `1.22.0-mips`, `1.22.0-mips` ([1.22.0/mips/Dockerfile](1.22.0/mips/Dockerfile))
+- `s390x`, `1.22.0-s390x`, `1.22.0-s390x` ([1.22.0/s390x/Dockerfile](1.22.0/s390x/Dockerfile))
+- `1.21-main`, `1.21.6-main` ([1.21/main/Dockerfile](1.21/main/Dockerfile))
+- `arm`, `1.21-arm`, `1.21.6-arm` ([1.21/arm/Dockerfile](1.21/arm/Dockerfile))
+- `powerpc`, `1.21-powerpc`, `1.21.6-powerpc` ([1.21/powerpc/Dockerfile](1.21/powerpc/Dockerfile))
+- `mips`, `1.21-mips`, `1.21.6-mips` ([1.21/mips/Dockerfile](1.21/mips/Dockerfile))
+- `s390x`, `1.21-s390x`, `1.21.6-s390x` ([1.21/s390x/Dockerfile](1.21/s390x/Dockerfile))
 
 ## Usage