Skip to content

Commit

Permalink
Bump Go version
Browse files Browse the repository at this point in the history
Signed-off-by: prombot <prometheus-team@googlegroups.com>
prombot committed Aug 7, 2024
1 parent 35e07b5 commit 1c6f5fe
Showing 5 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion 1.21/Makefile.COMMON
Original file line number Diff line number Diff line change
@@ -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.12
VERSION := 1.21.13
DIRNAME := $(shell basename $(CURDIR))
IMAGE_DIR ?= .build
IMAGE := $(REPOSITORY)/$(NAME)
4 changes: 2 additions & 2 deletions 1.21/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -35,9 +35,9 @@ RUN \
&& chmod 0755 /bin/yq \
&& rm -rf /var/lib/apt/lists/*

ENV GOLANG_VERSION 1.21.12
ENV GOLANG_VERSION 1.21.13
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
ENV GOLANG_DOWNLOAD_SHA256 121ab58632787e18ae0caa8ae285b581f9470d0f6b3defde9e1600e211f583c5
ENV GOLANG_DOWNLOAD_SHA256 502fc16d5910562461e6a6631fb6377de2322aad7304bf2bcd23500ba9dab4a7

RUN go_file=$(/bin/download.sh ${GOLANG_DOWNLOAD_URL} ${GOLANG_DOWNLOAD_SHA256}) \
&& tar -C /usr/local -xzf ${go_file} \
2 changes: 1 addition & 1 deletion 1.22/Makefile.COMMON
Original file line number Diff line number Diff line change
@@ -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.5
VERSION := 1.22.6
DIRNAME := $(shell basename $(CURDIR))
IMAGE_DIR ?= .build
IMAGE := $(REPOSITORY)/$(NAME)
4 changes: 2 additions & 2 deletions 1.22/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -35,9 +35,9 @@ RUN \
&& chmod 0755 /bin/yq \
&& rm -rf /var/lib/apt/lists/*

ENV GOLANG_VERSION 1.22.5
ENV GOLANG_VERSION 1.22.6
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
ENV GOLANG_DOWNLOAD_SHA256 904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0
ENV GOLANG_DOWNLOAD_SHA256 999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616

RUN go_file=$(/bin/download.sh ${GOLANG_DOWNLOAD_URL} ${GOLANG_DOWNLOAD_SHA256}) \
&& tar -C /usr/local -xzf ${go_file} \
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -7,16 +7,16 @@

Docker Builder Image for cross-building Golang Prometheus projects.

- `latest`, `main`, `1.22.5-main`, `1.22.5-main` ([1.22.5/main/Dockerfile](1.22.5/main/Dockerfile))
- `arm`, `1.22.5-arm`, `1.22.5-arm` ([1.22.5/arm/Dockerfile](1.22.5/arm/Dockerfile))
- `powerpc`, `1.22.5-powerpc`, `1.22.5-powerpc` ([1.22.5/powerpc/Dockerfile](1.22.5/powerpc/Dockerfile))
- `mips`, `1.22.5-mips`, `1.22.5-mips` ([1.22.5/mips/Dockerfile](1.22.5/mips/Dockerfile))
- `s390x`, `1.22.5-s390x`, `1.22.5-s390x` ([1.22.5/s390x/Dockerfile](1.22.5/s390x/Dockerfile))
- `1.21-main`, `1.21.12-main` ([1.21/main/Dockerfile](1.21/main/Dockerfile))
- `arm`, `1.21-arm`, `1.21.12-arm` ([1.21/arm/Dockerfile](1.21/arm/Dockerfile))
- `powerpc`, `1.21-powerpc`, `1.21.12-powerpc` ([1.21/powerpc/Dockerfile](1.21/powerpc/Dockerfile))
- `mips`, `1.21-mips`, `1.21.12-mips` ([1.21/mips/Dockerfile](1.21/mips/Dockerfile))
- `s390x`, `1.21-s390x`, `1.21.12-s390x` ([1.21/s390x/Dockerfile](1.21/s390x/Dockerfile))
- `latest`, `main`, `1.22.6-main`, `1.22.6-main` ([1.22.6/main/Dockerfile](1.22.6/main/Dockerfile))
- `arm`, `1.22.6-arm`, `1.22.6-arm` ([1.22.6/arm/Dockerfile](1.22.6/arm/Dockerfile))
- `powerpc`, `1.22.6-powerpc`, `1.22.6-powerpc` ([1.22.6/powerpc/Dockerfile](1.22.6/powerpc/Dockerfile))
- `mips`, `1.22.6-mips`, `1.22.6-mips` ([1.22.6/mips/Dockerfile](1.22.6/mips/Dockerfile))
- `s390x`, `1.22.6-s390x`, `1.22.6-s390x` ([1.22.6/s390x/Dockerfile](1.22.6/s390x/Dockerfile))
- `1.21-main`, `1.21.13-main` ([1.21/main/Dockerfile](1.21/main/Dockerfile))
- `arm`, `1.21-arm`, `1.21.13-arm` ([1.21/arm/Dockerfile](1.21/arm/Dockerfile))
- `powerpc`, `1.21-powerpc`, `1.21.13-powerpc` ([1.21/powerpc/Dockerfile](1.21/powerpc/Dockerfile))
- `mips`, `1.21-mips`, `1.21.13-mips` ([1.21/mips/Dockerfile](1.21/mips/Dockerfile))
- `s390x`, `1.21-s390x`, `1.21.13-s390x` ([1.21/s390x/Dockerfile](1.21/s390x/Dockerfile))

## Usage

0 comments on commit 1c6f5fe

Please sign in to comment.