Skip to content

Commit

Permalink
Merge pull request #261 from prometheus/bump_version
Browse files Browse the repository at this point in the history
Bump Go version
  • Loading branch information
SuperQ authored May 8, 2024
2 parents 6c63525 + 8102d01 commit 9275371
Show file tree
Hide file tree
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
Expand Up @@ -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.9
VERSION := 1.21.10
DIRNAME := $(shell basename $(CURDIR))
IMAGE_DIR ?= .build
IMAGE := $(REPOSITORY)/$(NAME)
Expand Down
4 changes: 2 additions & 2 deletions 1.21/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ RUN \
&& chmod 0755 /bin/yq \
&& rm -rf /var/lib/apt/lists/*

ENV GOLANG_VERSION 1.21.9
ENV GOLANG_VERSION 1.21.10
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
ENV GOLANG_DOWNLOAD_SHA256 f76194c2dc607e0df4ed2e7b825b5847cb37e34fc70d780e2f6c7e805634a7ea
ENV GOLANG_DOWNLOAD_SHA256 e330e5d977bf4f3bdc157bc46cf41afa5b13d66c914e12fd6b694ccda65fcf92

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

ENV GOLANG_VERSION 1.22.2
ENV GOLANG_VERSION 1.22.3
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
ENV GOLANG_DOWNLOAD_SHA256 5901c52b7a78002aeff14a21f93e0f064f74ce1360fce51c6ee68cd471216a17
ENV GOLANG_DOWNLOAD_SHA256 8920ea521bad8f6b7bc377b4824982e011c19af27df88a815e3586ea895f1b36

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

Docker Builder Image for cross-building Golang Prometheus projects.

- `latest`, `main`, `1.22.2-main`, `1.22.2-main` ([1.22.2/main/Dockerfile](1.22.2/main/Dockerfile))
- `arm`, `1.22.2-arm`, `1.22.2-arm` ([1.22.2/arm/Dockerfile](1.22.2/arm/Dockerfile))
- `powerpc`, `1.22.2-powerpc`, `1.22.2-powerpc` ([1.22.2/powerpc/Dockerfile](1.22.2/powerpc/Dockerfile))
- `mips`, `1.22.2-mips`, `1.22.2-mips` ([1.22.2/mips/Dockerfile](1.22.2/mips/Dockerfile))
- `s390x`, `1.22.2-s390x`, `1.22.2-s390x` ([1.22.2/s390x/Dockerfile](1.22.2/s390x/Dockerfile))
- `1.21-main`, `1.21.9-main` ([1.21/main/Dockerfile](1.21/main/Dockerfile))
- `arm`, `1.21-arm`, `1.21.9-arm` ([1.21/arm/Dockerfile](1.21/arm/Dockerfile))
- `powerpc`, `1.21-powerpc`, `1.21.9-powerpc` ([1.21/powerpc/Dockerfile](1.21/powerpc/Dockerfile))
- `mips`, `1.21-mips`, `1.21.9-mips` ([1.21/mips/Dockerfile](1.21/mips/Dockerfile))
- `s390x`, `1.21-s390x`, `1.21.9-s390x` ([1.21/s390x/Dockerfile](1.21/s390x/Dockerfile))
- `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))

## Usage

Expand Down

0 comments on commit 9275371

Please sign in to comment.