Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Go version #290

Merged
merged 1 commit into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.9
VERSION := 1.22.10
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.9
ENV GOLANG_VERSION 1.22.10
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
ENV GOLANG_DOWNLOAD_SHA256 84a8f05b7b969d8acfcaf194ce9298ad5d3ddbfc7034930c280006b5c85a574c
ENV GOLANG_DOWNLOAD_SHA256 736ce492a19d756a92719a6121226087ccd91b652ed5caec40ad6dbfb2252092

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.3
VERSION := 1.23.4
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.3
ENV GOLANG_VERSION 1.23.4
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
ENV GOLANG_DOWNLOAD_SHA256 a0afb9744c00648bafb1b90b4aba5bdb86f424f02f9275399ce0c20b93a2c3a8
ENV GOLANG_DOWNLOAD_SHA256 6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971

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.3-main`, `1.23.3-main` ([1.23.3/main/Dockerfile](1.23.3/main/Dockerfile))
- `arm`, `1.23.3-arm`, `1.23.3-arm` ([1.23.3/arm/Dockerfile](1.23.3/arm/Dockerfile))
- `powerpc`, `1.23.3-powerpc`, `1.23.3-powerpc` ([1.23.3/powerpc/Dockerfile](1.23.3/powerpc/Dockerfile))
- `mips`, `1.23.3-mips`, `1.23.3-mips` ([1.23.3/mips/Dockerfile](1.23.3/mips/Dockerfile))
- `s390x`, `1.23.3-s390x`, `1.23.3-s390x` ([1.23.3/s390x/Dockerfile](1.23.3/s390x/Dockerfile))
- `1.22-main`, `1.22.9-main` ([1.22/main/Dockerfile](1.22/main/Dockerfile))
- `arm`, `1.22-arm`, `1.22.9-arm` ([1.22/arm/Dockerfile](1.22/arm/Dockerfile))
- `powerpc`, `1.22-powerpc`, `1.22.9-powerpc` ([1.22/powerpc/Dockerfile](1.22/powerpc/Dockerfile))
- `mips`, `1.22-mips`, `1.22.9-mips` ([1.22/mips/Dockerfile](1.22/mips/Dockerfile))
- `s390x`, `1.22-s390x`, `1.22.9-s390x` ([1.22/s390x/Dockerfile](1.22/s390x/Dockerfile))
- `latest`, `main`, `1.23.4-main`, `1.23.4-main` ([1.23.4/main/Dockerfile](1.23.4/main/Dockerfile))
- `arm`, `1.23.4-arm`, `1.23.4-arm` ([1.23.4/arm/Dockerfile](1.23.4/arm/Dockerfile))
- `powerpc`, `1.23.4-powerpc`, `1.23.4-powerpc` ([1.23.4/powerpc/Dockerfile](1.23.4/powerpc/Dockerfile))
- `mips`, `1.23.4-mips`, `1.23.4-mips` ([1.23.4/mips/Dockerfile](1.23.4/mips/Dockerfile))
- `s390x`, `1.23.4-s390x`, `1.23.4-s390x` ([1.23.4/s390x/Dockerfile](1.23.4/s390x/Dockerfile))
- `1.22-main`, `1.22.10-main` ([1.22/main/Dockerfile](1.22/main/Dockerfile))
- `arm`, `1.22-arm`, `1.22.10-arm` ([1.22/arm/Dockerfile](1.22/arm/Dockerfile))
- `powerpc`, `1.22-powerpc`, `1.22.10-powerpc` ([1.22/powerpc/Dockerfile](1.22/powerpc/Dockerfile))
- `mips`, `1.22-mips`, `1.22.10-mips` ([1.22/mips/Dockerfile](1.22/mips/Dockerfile))
- `s390x`, `1.22-s390x`, `1.22.10-s390x` ([1.22/s390x/Dockerfile](1.22/s390x/Dockerfile))

## Usage

Expand Down
Loading