Skip to content

Commit 75099db

Browse files
authored
Merge pull request #306 from prometheus/bump_version
Bump Go version
2 parents 02b6655 + a937b82 commit 75099db

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

1.23/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.23.7
18+
VERSION := 1.23.8
1919
DIRNAME := $(shell basename $(CURDIR))
2020
IMAGE_DIR ?= .build
2121
IMAGE := $(REPOSITORY)/$(NAME)

1.23/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.23.7
38+
ENV GOLANG_VERSION 1.23.8
3939
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
40-
ENV GOLANG_DOWNLOAD_SHA256 4741525e69841f2e22f9992af25df0c1112b07501f61f741c12c6389fcb119f3
40+
ENV GOLANG_DOWNLOAD_SHA256 45b87381172a58d62c977f27c4683c8681ef36580abecd14fd124d24ca306d3f
4141

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

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.1
18+
VERSION := 1.24.2
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.1
38+
ENV GOLANG_VERSION 1.24.2
3939
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
40-
ENV GOLANG_DOWNLOAD_SHA256 cb2396bae64183cdccf81a9a6df0aea3bce9511fc21469fb89a0c00470088073
40+
ENV GOLANG_DOWNLOAD_SHA256 68097bd680839cbc9d464a0edce4f7c333975e27a90246890e9f1078c7e702ad
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.24.1-main`, `1.24.1-main` ([1.24.1/main/Dockerfile](1.24.1/main/Dockerfile))
11-
- `arm`, `1.24.1-arm`, `1.24.1-arm` ([1.24.1/arm/Dockerfile](1.24.1/arm/Dockerfile))
12-
- `powerpc`, `1.24.1-powerpc`, `1.24.1-powerpc` ([1.24.1/powerpc/Dockerfile](1.24.1/powerpc/Dockerfile))
13-
- `mips`, `1.24.1-mips`, `1.24.1-mips` ([1.24.1/mips/Dockerfile](1.24.1/mips/Dockerfile))
14-
- `s390x`, `1.24.1-s390x`, `1.24.1-s390x` ([1.24.1/s390x/Dockerfile](1.24.1/s390x/Dockerfile))
15-
- `1.23-main`, `1.23.7-main` ([1.23/main/Dockerfile](1.23/main/Dockerfile))
16-
- `arm`, `1.23-arm`, `1.23.7-arm` ([1.23/arm/Dockerfile](1.23/arm/Dockerfile))
17-
- `powerpc`, `1.23-powerpc`, `1.23.7-powerpc` ([1.23/powerpc/Dockerfile](1.23/powerpc/Dockerfile))
18-
- `mips`, `1.23-mips`, `1.23.7-mips` ([1.23/mips/Dockerfile](1.23/mips/Dockerfile))
19-
- `s390x`, `1.23-s390x`, `1.23.7-s390x` ([1.23/s390x/Dockerfile](1.23/s390x/Dockerfile))
10+
- `latest`, `main`, `1.24.2-main`, `1.24.2-main` ([1.24.2/main/Dockerfile](1.24.2/main/Dockerfile))
11+
- `arm`, `1.24.2-arm`, `1.24.2-arm` ([1.24.2/arm/Dockerfile](1.24.2/arm/Dockerfile))
12+
- `powerpc`, `1.24.2-powerpc`, `1.24.2-powerpc` ([1.24.2/powerpc/Dockerfile](1.24.2/powerpc/Dockerfile))
13+
- `mips`, `1.24.2-mips`, `1.24.2-mips` ([1.24.2/mips/Dockerfile](1.24.2/mips/Dockerfile))
14+
- `s390x`, `1.24.2-s390x`, `1.24.2-s390x` ([1.24.2/s390x/Dockerfile](1.24.2/s390x/Dockerfile))
15+
- `1.23-main`, `1.23.8-main` ([1.23/main/Dockerfile](1.23/main/Dockerfile))
16+
- `arm`, `1.23-arm`, `1.23.8-arm` ([1.23/arm/Dockerfile](1.23/arm/Dockerfile))
17+
- `powerpc`, `1.23-powerpc`, `1.23.8-powerpc` ([1.23/powerpc/Dockerfile](1.23/powerpc/Dockerfile))
18+
- `mips`, `1.23-mips`, `1.23.8-mips` ([1.23/mips/Dockerfile](1.23/mips/Dockerfile))
19+
- `s390x`, `1.23-s390x`, `1.23.8-s390x` ([1.23/s390x/Dockerfile](1.23/s390x/Dockerfile))
2020

2121
## Usage
2222

0 commit comments

Comments
 (0)