Skip to content

Commit 084ccca

Browse files
authored
Merge pull request #247 from prometheus/bump_version
Bump Go version
2 parents 03f5fc2 + 24f8499 commit 084ccca

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

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

1.21/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.21.6
38+
ENV GOLANG_VERSION 1.21.7
3939
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz
40-
ENV GOLANG_DOWNLOAD_SHA256 3f934f40ac360b9c01f616a9aa1796d227d8b0328bf64cb045c7b8c4ee9caea4
40+
ENV GOLANG_DOWNLOAD_SHA256 13b76a9b2a26823e53062fa841b07087d48ae2ef2936445dc34c4ae03293702c
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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ Docker Builder Image for cross-building Golang Prometheus projects.
1212
- `powerpc`, `1.22.0-powerpc`, `1.22.0-powerpc` ([1.22.0/powerpc/Dockerfile](1.22.0/powerpc/Dockerfile))
1313
- `mips`, `1.22.0-mips`, `1.22.0-mips` ([1.22.0/mips/Dockerfile](1.22.0/mips/Dockerfile))
1414
- `s390x`, `1.22.0-s390x`, `1.22.0-s390x` ([1.22.0/s390x/Dockerfile](1.22.0/s390x/Dockerfile))
15-
- `1.21-main`, `1.21.6-main` ([1.21/main/Dockerfile](1.21/main/Dockerfile))
16-
- `arm`, `1.21-arm`, `1.21.6-arm` ([1.21/arm/Dockerfile](1.21/arm/Dockerfile))
17-
- `powerpc`, `1.21-powerpc`, `1.21.6-powerpc` ([1.21/powerpc/Dockerfile](1.21/powerpc/Dockerfile))
18-
- `mips`, `1.21-mips`, `1.21.6-mips` ([1.21/mips/Dockerfile](1.21/mips/Dockerfile))
19-
- `s390x`, `1.21-s390x`, `1.21.6-s390x` ([1.21/s390x/Dockerfile](1.21/s390x/Dockerfile))
15+
- `1.21-main`, `1.21.7-main` ([1.21/main/Dockerfile](1.21/main/Dockerfile))
16+
- `arm`, `1.21-arm`, `1.21.7-arm` ([1.21/arm/Dockerfile](1.21/arm/Dockerfile))
17+
- `powerpc`, `1.21-powerpc`, `1.21.7-powerpc` ([1.21/powerpc/Dockerfile](1.21/powerpc/Dockerfile))
18+
- `mips`, `1.21-mips`, `1.21.7-mips` ([1.21/mips/Dockerfile](1.21/mips/Dockerfile))
19+
- `s390x`, `1.21-s390x`, `1.21.7-s390x` ([1.21/s390x/Dockerfile](1.21/s390x/Dockerfile))
2020

2121
## Usage
2222

0 commit comments

Comments
 (0)