From 60d2cd5c448e03f2a84482ba46caa8a2c7cb5ba4 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 12 Feb 2026 00:41:20 +0100 Subject: [PATCH] update to go1.25.7, alpine 3.23 Signed-off-by: Sebastiaan van Stijn --- .github/workflows/build.yml | 2 +- Dockerfile | 10 ++++++++-- dockerfiles/authors.Dockerfile | 4 +++- dockerfiles/docs.Dockerfile | 10 ++++++++-- dockerfiles/git.Dockerfile | 10 ++++++++-- dockerfiles/lint.Dockerfile | 11 +++++++++-- dockerfiles/vendor.Dockerfile | 11 +++++++++-- 7 files changed, 46 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d7633181..fa5ae545b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: matrix: go: - 1.23.7 - - 1.24.1 + - 1.25.7 target: - test-coverage - test-s3-storage diff --git a/Dockerfile b/Dockerfile index da204cb39..9d18ead16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,13 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.23.7 -ARG ALPINE_VERSION=3.21 +# GO_VERSION sets the version of the golang base image to use. +# It must be a supported tag in the docker.io/library/golang image repository. +ARG GO_VERSION=1.25.7 + +# ALPINE_VERSION sets the version of the alpine base image to use, including for the golang image. +# It must be a supported tag in the docker.io/library/alpine image repository +# that's also available as alpine image variant for the Golang version used. +ARG ALPINE_VERSION=3.23 # XX_VERSION sets the version of the tonistiigi/xx utility to use. # It must be a valid tag in the docker.io/tonistiigi/xx image repository. diff --git a/dockerfiles/authors.Dockerfile b/dockerfiles/authors.Dockerfile index fad3d4cb1..b678565f0 100644 --- a/dockerfiles/authors.Dockerfile +++ b/dockerfiles/authors.Dockerfile @@ -1,6 +1,8 @@ # syntax=docker/dockerfile:1 -ARG ALPINE_VERSION=3.21 +# ALPINE_VERSION sets the version of the alpine base image to use. +# It must be a supported tag in the docker.io/library/alpine image repository. +ARG ALPINE_VERSION=3.23 FROM alpine:${ALPINE_VERSION} AS gen RUN apk add --no-cache git diff --git a/dockerfiles/docs.Dockerfile b/dockerfiles/docs.Dockerfile index 07f86a233..8c97c5e40 100644 --- a/dockerfiles/docs.Dockerfile +++ b/dockerfiles/docs.Dockerfile @@ -1,7 +1,13 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.23.7 -ARG ALPINE_VERSION=3.21 +# GO_VERSION sets the version of the golang base image to use. +# It must be a supported tag in the docker.io/library/golang image repository. +ARG GO_VERSION=1.25.7 + +# ALPINE_VERSION sets the version of the alpine base image to use, including for the golang image. +# It must be a supported tag in the docker.io/library/alpine image repository +# that's also available as alpine image variant for the Golang version used. +ARG ALPINE_VERSION=3.23 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base RUN apk add --no-cache git diff --git a/dockerfiles/git.Dockerfile b/dockerfiles/git.Dockerfile index ff3fd3bb8..ba96fa447 100644 --- a/dockerfiles/git.Dockerfile +++ b/dockerfiles/git.Dockerfile @@ -1,7 +1,13 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.23.7 -ARG ALPINE_VERSION=3.21 +# GO_VERSION sets the version of the golang base image to use. +# It must be a supported tag in the docker.io/library/golang image repository. +ARG GO_VERSION=1.25.7 + +# ALPINE_VERSION sets the version of the alpine base image to use, including for the golang image. +# It must be a supported tag in the docker.io/library/alpine image repository +# that's also available as alpine image variant for the Golang version used. +ARG ALPINE_VERSION=3.23 FROM alpine:${ALPINE_VERSION} AS base RUN apk add --no-cache git gpg diff --git a/dockerfiles/lint.Dockerfile b/dockerfiles/lint.Dockerfile index 3f8db195e..af7884ad7 100644 --- a/dockerfiles/lint.Dockerfile +++ b/dockerfiles/lint.Dockerfile @@ -1,7 +1,14 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.23.7 -ARG ALPINE_VERSION=3.21 +# GO_VERSION sets the version of the golang base image to use. +# It must be a supported tag in the docker.io/library/golang image repository. +ARG GO_VERSION=1.25.7 + +# ALPINE_VERSION sets the version of the alpine base image to use, including for the golang image. +# It must be a supported tag in the docker.io/library/alpine image repository +# that's also available as alpine image variant for the Golang version used. +ARG ALPINE_VERSION=3.23 + # GOLANGCI_LINT_VERSION sets the version of the golangci/golangci-lint image to use. ARG GOLANGCI_LINT_VERSION=v2.9 ARG BUILDTAGS="" diff --git a/dockerfiles/vendor.Dockerfile b/dockerfiles/vendor.Dockerfile index 0a35e86fd..335ac2904 100644 --- a/dockerfiles/vendor.Dockerfile +++ b/dockerfiles/vendor.Dockerfile @@ -1,7 +1,14 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.23.7 -ARG ALPINE_VERSION=3.21 +# GO_VERSION sets the version of the golang base image to use. +# It must be a supported tag in the docker.io/library/golang image repository. +ARG GO_VERSION=1.25.7 + +# ALPINE_VERSION sets the version of the alpine base image to use, including for the golang image. +# It must be a supported tag in the docker.io/library/alpine image repository +# that's also available as alpine image variant for the Golang version used. +ARG ALPINE_VERSION=3.23 + ARG MODOUTDATED_VERSION=v0.8.0 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base