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 #253

Merged
merged 1 commit into from
Mar 6, 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.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.7
VERSION := 1.21.8
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.7
ENV GOLANG_VERSION 1.21.8
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
ENV GOLANG_DOWNLOAD_SHA256 13b76a9b2a26823e53062fa841b07087d48ae2ef2936445dc34c4ae03293702c
ENV GOLANG_DOWNLOAD_SHA256 538b3b143dc7f32b093c8ffe0e050c260b57fc9d57a12c4140a639a8dd2b4e4f

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.0
VERSION := 1.22.1
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.0
ENV GOLANG_VERSION 1.22.1
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
ENV GOLANG_DOWNLOAD_SHA256 f6c8a87aa03b92c4b0bf3d558e28ea03006eb29db78917daec5cfb6ec1046265
ENV GOLANG_DOWNLOAD_SHA256 aab8e15785c997ae20f9c88422ee35d962c4562212bb0f879d052a35c8307c7f

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.0-main`, `1.22.0-main` ([1.22.0/main/Dockerfile](1.22.0/main/Dockerfile))
- `arm`, `1.22.0-arm`, `1.22.0-arm` ([1.22.0/arm/Dockerfile](1.22.0/arm/Dockerfile))
- `powerpc`, `1.22.0-powerpc`, `1.22.0-powerpc` ([1.22.0/powerpc/Dockerfile](1.22.0/powerpc/Dockerfile))
- `mips`, `1.22.0-mips`, `1.22.0-mips` ([1.22.0/mips/Dockerfile](1.22.0/mips/Dockerfile))
- `s390x`, `1.22.0-s390x`, `1.22.0-s390x` ([1.22.0/s390x/Dockerfile](1.22.0/s390x/Dockerfile))
- `1.21-main`, `1.21.7-main` ([1.21/main/Dockerfile](1.21/main/Dockerfile))
- `arm`, `1.21-arm`, `1.21.7-arm` ([1.21/arm/Dockerfile](1.21/arm/Dockerfile))
- `powerpc`, `1.21-powerpc`, `1.21.7-powerpc` ([1.21/powerpc/Dockerfile](1.21/powerpc/Dockerfile))
- `mips`, `1.21-mips`, `1.21.7-mips` ([1.21/mips/Dockerfile](1.21/mips/Dockerfile))
- `s390x`, `1.21-s390x`, `1.21.7-s390x` ([1.21/s390x/Dockerfile](1.21/s390x/Dockerfile))
- `latest`, `main`, `1.22.1-main`, `1.22.1-main` ([1.22.1/main/Dockerfile](1.22.1/main/Dockerfile))
- `arm`, `1.22.1-arm`, `1.22.1-arm` ([1.22.1/arm/Dockerfile](1.22.1/arm/Dockerfile))
- `powerpc`, `1.22.1-powerpc`, `1.22.1-powerpc` ([1.22.1/powerpc/Dockerfile](1.22.1/powerpc/Dockerfile))
- `mips`, `1.22.1-mips`, `1.22.1-mips` ([1.22.1/mips/Dockerfile](1.22.1/mips/Dockerfile))
- `s390x`, `1.22.1-s390x`, `1.22.1-s390x` ([1.22.1/s390x/Dockerfile](1.22.1/s390x/Dockerfile))
- `1.21-main`, `1.21.8-main` ([1.21/main/Dockerfile](1.21/main/Dockerfile))
- `arm`, `1.21-arm`, `1.21.8-arm` ([1.21/arm/Dockerfile](1.21/arm/Dockerfile))
- `powerpc`, `1.21-powerpc`, `1.21.8-powerpc` ([1.21/powerpc/Dockerfile](1.21/powerpc/Dockerfile))
- `mips`, `1.21-mips`, `1.21.8-mips` ([1.21/mips/Dockerfile](1.21/mips/Dockerfile))
- `s390x`, `1.21-s390x`, `1.21.8-s390x` ([1.21/s390x/Dockerfile](1.21/s390x/Dockerfile))

## Usage

Expand Down
Loading