Skip to content

Commit 3cb9e95

Browse files
authored
Merge pull request #326 from prometheus/bump_version
Bump Go version
2 parents e06f8d4 + d55e3c7 commit 3cb9e95

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

1.24/Makefile.COMMON

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ REPOSITORY := quay.io/prometheus
1515
NAME := golang-builder
1616
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
1717
SUFFIX ?= -$(subst /,-,$(BRANCH))
18-
VERSION := 1.24.9
18+
VERSION := 1.24.10
1919
DIRNAME := $(shell basename $(CURDIR))
2020
IMAGE_DIR ?= .build
2121
IMAGE := $(REPOSITORY)/$(NAME)

1.24/base/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ RUN \
3535
&& chmod 0755 /bin/yq \
3636
&& rm -rf /var/lib/apt/lists/*
3737

38-
ENV GOLANG_VERSION 1.24.9
38+
ENV GOLANG_VERSION 1.24.10
3939
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
40-
ENV GOLANG_DOWNLOAD_SHA256 5b7899591c2dd6e9da1809fde4a2fad842c45d3f6b9deb235ba82216e31e34a6
40+
ENV GOLANG_DOWNLOAD_SHA256 dd52b974e3d9c5a7bbfb222c685806def6be5d6f7efd10f9caa9ca1fa2f47955
4141

4242
RUN go_file=$(/bin/download.sh ${GOLANG_DOWNLOAD_URL} ${GOLANG_DOWNLOAD_SHA256}) \
4343
&& tar -C /usr/local -xzf ${go_file} \

1.25/Makefile.COMMON

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ REPOSITORY := quay.io/prometheus
1515
NAME := golang-builder
1616
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
1717
SUFFIX ?= -$(subst /,-,$(BRANCH))
18-
VERSION := 1.25.3
18+
VERSION := 1.25.4
1919
DIRNAME := $(shell basename $(CURDIR))
2020
IMAGE_DIR ?= .build
2121
IMAGE := $(REPOSITORY)/$(NAME)

1.25/base/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ RUN \
3535
&& chmod 0755 /bin/yq \
3636
&& rm -rf /var/lib/apt/lists/*
3737

38-
ENV GOLANG_VERSION 1.25.3
38+
ENV GOLANG_VERSION 1.25.4
3939
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
40-
ENV GOLANG_DOWNLOAD_SHA256 0335f314b6e7bfe08c3d0cfaa7c19db961b7b99fb20be62b0a826c992ad14e0f
40+
ENV GOLANG_DOWNLOAD_SHA256 9fa5ffeda4170de60f67f3aa0f824e426421ba724c21e133c1e35d6159ca1bec
4141

4242
RUN go_file=$(/bin/download.sh ${GOLANG_DOWNLOAD_URL} ${GOLANG_DOWNLOAD_SHA256}) \
4343
&& tar -C /usr/local -xzf ${go_file} \

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77

88
Docker Builder Image for cross-building Golang Prometheus projects.
99

10-
- `latest`, `main`, `1.25.3-main`, `1.25.3-main` ([1.25.3/main/Dockerfile](1.25.3/main/Dockerfile))
11-
- `arm`, `1.25.3-arm`, `1.25.3-arm` ([1.25.3/arm/Dockerfile](1.25.3/arm/Dockerfile))
12-
- `powerpc`, `1.25.3-powerpc`, `1.25.3-powerpc` ([1.25.3/powerpc/Dockerfile](1.25.3/powerpc/Dockerfile))
13-
- `mips`, `1.25.3-mips`, `1.25.3-mips` ([1.25.3/mips/Dockerfile](1.25.3/mips/Dockerfile))
14-
- `s390x`, `1.25.3-s390x`, `1.25.3-s390x` ([1.25.3/s390x/Dockerfile](1.25.3/s390x/Dockerfile))
15-
- `1.24-main`, `1.24.9-main` ([1.24/main/Dockerfile](1.24/main/Dockerfile))
16-
- `arm`, `1.24-arm`, `1.24.9-arm` ([1.24/arm/Dockerfile](1.24/arm/Dockerfile))
17-
- `powerpc`, `1.24-powerpc`, `1.24.9-powerpc` ([1.24/powerpc/Dockerfile](1.24/powerpc/Dockerfile))
18-
- `mips`, `1.24-mips`, `1.24.9-mips` ([1.24/mips/Dockerfile](1.24/mips/Dockerfile))
19-
- `s390x`, `1.24-s390x`, `1.24.9-s390x` ([1.24/s390x/Dockerfile](1.24/s390x/Dockerfile))
10+
- `latest`, `main`, `1.25.4-main`, `1.25.4-main` ([1.25.4/main/Dockerfile](1.25.4/main/Dockerfile))
11+
- `arm`, `1.25.4-arm`, `1.25.4-arm` ([1.25.4/arm/Dockerfile](1.25.4/arm/Dockerfile))
12+
- `powerpc`, `1.25.4-powerpc`, `1.25.4-powerpc` ([1.25.4/powerpc/Dockerfile](1.25.4/powerpc/Dockerfile))
13+
- `mips`, `1.25.4-mips`, `1.25.4-mips` ([1.25.4/mips/Dockerfile](1.25.4/mips/Dockerfile))
14+
- `s390x`, `1.25.4-s390x`, `1.25.4-s390x` ([1.25.4/s390x/Dockerfile](1.25.4/s390x/Dockerfile))
15+
- `1.24-main`, `1.24.10-main` ([1.24/main/Dockerfile](1.24/main/Dockerfile))
16+
- `arm`, `1.24-arm`, `1.24.10-arm` ([1.24/arm/Dockerfile](1.24/arm/Dockerfile))
17+
- `powerpc`, `1.24-powerpc`, `1.24.10-powerpc` ([1.24/powerpc/Dockerfile](1.24/powerpc/Dockerfile))
18+
- `mips`, `1.24-mips`, `1.24.10-mips` ([1.24/mips/Dockerfile](1.24/mips/Dockerfile))
19+
- `s390x`, `1.24-s390x`, `1.24.10-s390x` ([1.24/s390x/Dockerfile](1.24/s390x/Dockerfile))
2020

2121
## Usage
2222

0 commit comments

Comments
 (0)