Merge pull request #224 from prometheus/bump_version

Bump Go version
prometheus · Sep 7, 2023 · 52d7260 · 52d7260
2 parents 28e15c6 + 2edc6b2
commit 52d7260
Show file tree

Hide file tree

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

diff --git 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.7
+ENV GOLANG_VERSION 1.20.8
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256 f0a87f1bcae91c4b69f8dc2bc6d7e6bfcd7524fceec130af525058c0c17b1b44
+ENV GOLANG_DOWNLOAD_SHA256 cc97c28d9c252fbf28f91950d830201aa403836cbed702a05932e63f7f0c7bc4
 
 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
@@ -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.0
+VERSION       := 1.21.1
 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.0
+ENV GOLANG_VERSION 1.21.1
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256 d0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742
+ENV GOLANG_DOWNLOAD_SHA256 b3075ae1ce5dab85f89bc7905d1632de23ca196bd8336afd93fa97434cfa55ae
 
 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.21.0-main`, `1.21.0-main` ([1.21.0/main/Dockerfile](1.21.0/main/Dockerfile))
-- `arm`, `1.21.0-arm`, `1.21.0-arm` ([1.21.0/arm/Dockerfile](1.21.0/arm/Dockerfile))
-- `powerpc`, `1.21.0-powerpc`, `1.21.0-powerpc` ([1.21.0/powerpc/Dockerfile](1.21.0/powerpc/Dockerfile))
-- `mips`, `1.21.0-mips`, `1.21.0-mips` ([1.21.0/mips/Dockerfile](1.21.0/mips/Dockerfile))
-- `s390x`, `1.21.0-s390x`, `1.21.0-s390x` ([1.21.0/s390x/Dockerfile](1.21.0/s390x/Dockerfile))
-- `1.20-main`, `1.20.7-main` ([1.20/main/Dockerfile](1.20/main/Dockerfile))
-- `arm`, `1.20-arm`, `1.20.7-arm` ([1.20/arm/Dockerfile](1.20/arm/Dockerfile))
-- `powerpc`, `1.20-powerpc`, `1.20.7-powerpc` ([1.20/powerpc/Dockerfile](1.20/powerpc/Dockerfile))
-- `mips`, `1.20-mips`, `1.20.7-mips` ([1.20/mips/Dockerfile](1.20/mips/Dockerfile))
-- `s390x`, `1.20-s390x`, `1.20.7-s390x` ([1.20/s390x/Dockerfile](1.20/s390x/Dockerfile))
+- `latest`, `main`, `1.21.1-main`, `1.21.1-main` ([1.21.1/main/Dockerfile](1.21.1/main/Dockerfile))
+- `arm`, `1.21.1-arm`, `1.21.1-arm` ([1.21.1/arm/Dockerfile](1.21.1/arm/Dockerfile))
+- `powerpc`, `1.21.1-powerpc`, `1.21.1-powerpc` ([1.21.1/powerpc/Dockerfile](1.21.1/powerpc/Dockerfile))
+- `mips`, `1.21.1-mips`, `1.21.1-mips` ([1.21.1/mips/Dockerfile](1.21.1/mips/Dockerfile))
+- `s390x`, `1.21.1-s390x`, `1.21.1-s390x` ([1.21.1/s390x/Dockerfile](1.21.1/s390x/Dockerfile))
+- `1.20-main`, `1.20.8-main` ([1.20/main/Dockerfile](1.20/main/Dockerfile))
+- `arm`, `1.20-arm`, `1.20.8-arm` ([1.20/arm/Dockerfile](1.20/arm/Dockerfile))
+- `powerpc`, `1.20-powerpc`, `1.20.8-powerpc` ([1.20/powerpc/Dockerfile](1.20/powerpc/Dockerfile))
+- `mips`, `1.20-mips`, `1.20.8-mips` ([1.20/mips/Dockerfile](1.20/mips/Dockerfile))
+- `s390x`, `1.20-s390x`, `1.20.8-s390x` ([1.20/s390x/Dockerfile](1.20/s390x/Dockerfile))
 
 ## Usage