diff --git a/1.21/Makefile.COMMON b/1.21/Makefile.COMMON index a5b0c92..0db1cff 100644 --- a/1.21/Makefile.COMMON +++ b/1.21/Makefile.COMMON @@ -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.11 +VERSION := 1.21.12 DIRNAME := $(shell basename $(CURDIR)) IMAGE_DIR ?= .build IMAGE := $(REPOSITORY)/$(NAME) diff --git a/1.21/base/Dockerfile b/1.21/base/Dockerfile index d4f025d..3641f64 100644 --- a/1.21/base/Dockerfile +++ b/1.21/base/Dockerfile @@ -35,9 +35,9 @@ RUN \ && chmod 0755 /bin/yq \ && rm -rf /var/lib/apt/lists/* -ENV GOLANG_VERSION 1.21.11 +ENV GOLANG_VERSION 1.21.12 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz -ENV GOLANG_DOWNLOAD_SHA256 54a87a9325155b98c85bc04dc50298ddd682489eb47f486f2e6cb0707554abf0 +ENV GOLANG_DOWNLOAD_SHA256 121ab58632787e18ae0caa8ae285b581f9470d0f6b3defde9e1600e211f583c5 RUN go_file=$(/bin/download.sh ${GOLANG_DOWNLOAD_URL} ${GOLANG_DOWNLOAD_SHA256}) \ && tar -C /usr/local -xzf ${go_file} \ diff --git a/1.22/Makefile.COMMON b/1.22/Makefile.COMMON index 662df79..53bc617 100644 --- a/1.22/Makefile.COMMON +++ b/1.22/Makefile.COMMON @@ -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.4 +VERSION := 1.22.5 DIRNAME := $(shell basename $(CURDIR)) IMAGE_DIR ?= .build IMAGE := $(REPOSITORY)/$(NAME) diff --git a/1.22/base/Dockerfile b/1.22/base/Dockerfile index f84fb0a..637c10c 100644 --- a/1.22/base/Dockerfile +++ b/1.22/base/Dockerfile @@ -35,9 +35,9 @@ RUN \ && chmod 0755 /bin/yq \ && rm -rf /var/lib/apt/lists/* -ENV GOLANG_VERSION 1.22.4 +ENV GOLANG_VERSION 1.22.5 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz -ENV GOLANG_DOWNLOAD_SHA256 ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d +ENV GOLANG_DOWNLOAD_SHA256 904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0 RUN go_file=$(/bin/download.sh ${GOLANG_DOWNLOAD_URL} ${GOLANG_DOWNLOAD_SHA256}) \ && tar -C /usr/local -xzf ${go_file} \ diff --git a/README.md b/README.md index 09dede8..f6e8c7e 100644 --- a/README.md +++ b/README.md @@ -7,16 +7,16 @@ Docker Builder Image for cross-building Golang Prometheus projects. -- `latest`, `main`, `1.22.4-main`, `1.22.4-main` ([1.22.4/main/Dockerfile](1.22.4/main/Dockerfile)) -- `arm`, `1.22.4-arm`, `1.22.4-arm` ([1.22.4/arm/Dockerfile](1.22.4/arm/Dockerfile)) -- `powerpc`, `1.22.4-powerpc`, `1.22.4-powerpc` ([1.22.4/powerpc/Dockerfile](1.22.4/powerpc/Dockerfile)) -- `mips`, `1.22.4-mips`, `1.22.4-mips` ([1.22.4/mips/Dockerfile](1.22.4/mips/Dockerfile)) -- `s390x`, `1.22.4-s390x`, `1.22.4-s390x` ([1.22.4/s390x/Dockerfile](1.22.4/s390x/Dockerfile)) -- `1.21-main`, `1.21.11-main` ([1.21/main/Dockerfile](1.21/main/Dockerfile)) -- `arm`, `1.21-arm`, `1.21.11-arm` ([1.21/arm/Dockerfile](1.21/arm/Dockerfile)) -- `powerpc`, `1.21-powerpc`, `1.21.11-powerpc` ([1.21/powerpc/Dockerfile](1.21/powerpc/Dockerfile)) -- `mips`, `1.21-mips`, `1.21.11-mips` ([1.21/mips/Dockerfile](1.21/mips/Dockerfile)) -- `s390x`, `1.21-s390x`, `1.21.11-s390x` ([1.21/s390x/Dockerfile](1.21/s390x/Dockerfile)) +- `latest`, `main`, `1.22.5-main`, `1.22.5-main` ([1.22.5/main/Dockerfile](1.22.5/main/Dockerfile)) +- `arm`, `1.22.5-arm`, `1.22.5-arm` ([1.22.5/arm/Dockerfile](1.22.5/arm/Dockerfile)) +- `powerpc`, `1.22.5-powerpc`, `1.22.5-powerpc` ([1.22.5/powerpc/Dockerfile](1.22.5/powerpc/Dockerfile)) +- `mips`, `1.22.5-mips`, `1.22.5-mips` ([1.22.5/mips/Dockerfile](1.22.5/mips/Dockerfile)) +- `s390x`, `1.22.5-s390x`, `1.22.5-s390x` ([1.22.5/s390x/Dockerfile](1.22.5/s390x/Dockerfile)) +- `1.21-main`, `1.21.12-main` ([1.21/main/Dockerfile](1.21/main/Dockerfile)) +- `arm`, `1.21-arm`, `1.21.12-arm` ([1.21/arm/Dockerfile](1.21/arm/Dockerfile)) +- `powerpc`, `1.21-powerpc`, `1.21.12-powerpc` ([1.21/powerpc/Dockerfile](1.21/powerpc/Dockerfile)) +- `mips`, `1.21-mips`, `1.21.12-mips` ([1.21/mips/Dockerfile](1.21/mips/Dockerfile)) +- `s390x`, `1.21-s390x`, `1.21.12-s390x` ([1.21/s390x/Dockerfile](1.21/s390x/Dockerfile)) ## Usage