Skip to content

Commit

Permalink
Merge pull request #283 from prometheus/bump_version
Browse files Browse the repository at this point in the history
Bump Go version
  • Loading branch information
simonpasquier authored Oct 2, 2024
2 parents abf3909 + b0a8b28 commit 91ed65f
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
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.7
VERSION := 1.22.8
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.7
ENV GOLANG_VERSION 1.22.8
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
ENV GOLANG_DOWNLOAD_SHA256 fc5d49b7a5035f1f1b265c17aa86e9819e6dc9af8260ad61430ee7fbe27881bb
ENV GOLANG_DOWNLOAD_SHA256 5f467d29fc67c7ae6468cb6ad5b047a274bae8180cac5e0b7ddbfeba3e47e18f

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.23/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.23.1
VERSION := 1.23.2
DIRNAME := $(shell basename $(CURDIR))
IMAGE_DIR ?= .build
IMAGE := $(REPOSITORY)/$(NAME)
Expand Down
4 changes: 2 additions & 2 deletions 1.23/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.23.1
ENV GOLANG_VERSION 1.23.2
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
ENV GOLANG_DOWNLOAD_SHA256 49bbb517cfa9eee677e1e7897f7cf9cfdbcf49e05f61984a2789136de359f9bd
ENV GOLANG_DOWNLOAD_SHA256 542d3c1705f1c6a1c5a80d5dc62e2e45171af291e755d591c5e6531ef63b454e

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.23.1-main`, `1.23.1-main` ([1.23.1/main/Dockerfile](1.23.1/main/Dockerfile))
- `arm`, `1.23.1-arm`, `1.23.1-arm` ([1.23.1/arm/Dockerfile](1.23.1/arm/Dockerfile))
- `powerpc`, `1.23.1-powerpc`, `1.23.1-powerpc` ([1.23.1/powerpc/Dockerfile](1.23.1/powerpc/Dockerfile))
- `mips`, `1.23.1-mips`, `1.23.1-mips` ([1.23.1/mips/Dockerfile](1.23.1/mips/Dockerfile))
- `s390x`, `1.23.1-s390x`, `1.23.1-s390x` ([1.23.1/s390x/Dockerfile](1.23.1/s390x/Dockerfile))
- `1.22-main`, `1.22.7-main` ([1.22/main/Dockerfile](1.22/main/Dockerfile))
- `arm`, `1.22-arm`, `1.22.7-arm` ([1.22/arm/Dockerfile](1.22/arm/Dockerfile))
- `powerpc`, `1.22-powerpc`, `1.22.7-powerpc` ([1.22/powerpc/Dockerfile](1.22/powerpc/Dockerfile))
- `mips`, `1.22-mips`, `1.22.7-mips` ([1.22/mips/Dockerfile](1.22/mips/Dockerfile))
- `s390x`, `1.22-s390x`, `1.22.7-s390x` ([1.22/s390x/Dockerfile](1.22/s390x/Dockerfile))
- `latest`, `main`, `1.23.2-main`, `1.23.2-main` ([1.23.2/main/Dockerfile](1.23.2/main/Dockerfile))
- `arm`, `1.23.2-arm`, `1.23.2-arm` ([1.23.2/arm/Dockerfile](1.23.2/arm/Dockerfile))
- `powerpc`, `1.23.2-powerpc`, `1.23.2-powerpc` ([1.23.2/powerpc/Dockerfile](1.23.2/powerpc/Dockerfile))
- `mips`, `1.23.2-mips`, `1.23.2-mips` ([1.23.2/mips/Dockerfile](1.23.2/mips/Dockerfile))
- `s390x`, `1.23.2-s390x`, `1.23.2-s390x` ([1.23.2/s390x/Dockerfile](1.23.2/s390x/Dockerfile))
- `1.22-main`, `1.22.8-main` ([1.22/main/Dockerfile](1.22/main/Dockerfile))
- `arm`, `1.22-arm`, `1.22.8-arm` ([1.22/arm/Dockerfile](1.22/arm/Dockerfile))
- `powerpc`, `1.22-powerpc`, `1.22.8-powerpc` ([1.22/powerpc/Dockerfile](1.22/powerpc/Dockerfile))
- `mips`, `1.22-mips`, `1.22.8-mips` ([1.22/mips/Dockerfile](1.22/mips/Dockerfile))
- `s390x`, `1.22-s390x`, `1.22.8-s390x` ([1.22/s390x/Dockerfile](1.22/s390x/Dockerfile))

## Usage

Expand Down

0 comments on commit 91ed65f

Please sign in to comment.