From 62a58a6f50c6c5bb774e599fbc5c7ba0f6cb7c32 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Tue, 14 Oct 2025 11:05:31 +0200 Subject: [PATCH 1/3] update go to 1.24.9 Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- docker-bake.hcl | 12 ++++++------ pkg/buildx/Dockerfile | 2 +- pkg/compose/Dockerfile | 2 +- pkg/containerd/Dockerfile | 2 +- pkg/credential-helpers/Dockerfile | 2 +- pkg/model/Dockerfile | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 7fd7a04d..4018dfbf 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -142,7 +142,7 @@ variable "GO_IMAGE" { } variable "GO_VERSION" { description = "Go version to use for building packages." - default = "1.24.8" + default = "1.24.9" } variable "GO_IMAGE_VARIANT" { description = "Go image variant to use for building packages." @@ -516,7 +516,7 @@ target "_pkg-buildx" { PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-buildx-plugin" PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/buildx.git" PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master" - GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.8" # https://github.com/docker/buildx/blob/0c747263ef1426f5fa217fcdb616eddf33da6c2d/Dockerfile#L3 + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.9" # https://github.com/docker/buildx/blob/0c747263ef1426f5fa217fcdb616eddf33da6c2d/Dockerfile#L3 GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm" PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "" } @@ -527,7 +527,7 @@ target "_pkg-compose" { PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-compose-plugin" PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/compose.git" PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main" - GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.8" # https://github.com/docker/compose/blob/fa081274567ac350f0e5f16abbe51701b320626e/Dockerfile#L18 + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.9" # https://github.com/docker/compose/blob/fa081274567ac350f0e5f16abbe51701b320626e/Dockerfile#L18 GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm" PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "" } @@ -538,7 +538,7 @@ target "_pkg-containerd" { PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "containerd.io" PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/containerd/containerd.git" PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main" - GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.8" # https://github.com/containerd/containerd/blob/2d28d98490f53d78c98faecfc91f9fd54cdbc16e/.github/workflows/release.yml#L16 + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.9" # https://github.com/containerd/containerd/blob/2d28d98490f53d78c98faecfc91f9fd54cdbc16e/.github/workflows/release.yml#L16 GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm" PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "" } @@ -549,7 +549,7 @@ target "_pkg-credential-helpers" { PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-credential-helpers" PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/docker-credential-helpers.git" PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master" - GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.8" # https://github.com/docker/docker-credential-helpers/blob/d4602cd9173ff3126de9fa67353efa73598b639b/Dockerfile#L3 + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.9" # https://github.com/docker/docker-credential-helpers/blob/d4602cd9173ff3126de9fa67353efa73598b639b/Dockerfile#L3 GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm" PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "" } @@ -582,7 +582,7 @@ target "_pkg-model" { PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-model-plugin" PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/model-runner.git" PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main" - GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.8" # https://github.com/docker/model-runner/blob/039f7a31c0365f9161c9b9b6bb3888161d16e388/cmd/cli/Dockerfile#L3 + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.9" # https://github.com/docker/model-runner/blob/039f7a31c0365f9161c9b9b6bb3888161d16e388/cmd/cli/Dockerfile#L3 GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm" PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "" } diff --git a/pkg/buildx/Dockerfile b/pkg/buildx/Dockerfile index 3808a3ea..6fbf77ad 100644 --- a/pkg/buildx/Dockerfile +++ b/pkg/buildx/Dockerfile @@ -29,7 +29,7 @@ ARG PKG_REPO="https://github.com/docker/buildx.git" ARG PKG_REF="master" ARG GO_IMAGE="golang" -ARG GO_VERSION=1.24.8 +ARG GO_VERSION=1.24.9 ARG GO_IMAGE_VARIANT="bookworm" # stage used as named context that mounts hack/scripts diff --git a/pkg/compose/Dockerfile b/pkg/compose/Dockerfile index 7b5e9623..8e082944 100644 --- a/pkg/compose/Dockerfile +++ b/pkg/compose/Dockerfile @@ -29,7 +29,7 @@ ARG PKG_REPO="https://github.com/docker/compose.git" ARG PKG_REF="main" ARG GO_IMAGE="golang" -ARG GO_VERSION=1.24.8 +ARG GO_VERSION=1.24.9 ARG GO_IMAGE_VARIANT="bookworm" # stage used as named context that mounts hack/scripts diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 50825032..e3787758 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -35,7 +35,7 @@ ARG PKG_REPO="https://github.com/containerd/containerd.git" ARG PKG_REF="main" ARG GO_IMAGE="golang" -ARG GO_VERSION=1.24.8 +ARG GO_VERSION=1.24.9 ARG GO_IMAGE_VARIANT="bookworm" # stage used as named context that mounts hack/scripts diff --git a/pkg/credential-helpers/Dockerfile b/pkg/credential-helpers/Dockerfile index 1dc51a03..f19eb5be 100644 --- a/pkg/credential-helpers/Dockerfile +++ b/pkg/credential-helpers/Dockerfile @@ -30,7 +30,7 @@ ARG PKG_REPO="https://github.com/docker/docker-credential-helpers.git" ARG PKG_REF="master" ARG GO_IMAGE="golang" -ARG GO_VERSION=1.24.8 +ARG GO_VERSION=1.24.9 ARG GO_IMAGE_VARIANT="bookworm" # stage used as named context that mounts hack/scripts diff --git a/pkg/model/Dockerfile b/pkg/model/Dockerfile index 365e95c5..522430be 100644 --- a/pkg/model/Dockerfile +++ b/pkg/model/Dockerfile @@ -29,7 +29,7 @@ ARG PKG_REPO="https://github.com/docker/model-runner.git" ARG PKG_REF="main" ARG GO_IMAGE="golang" -ARG GO_VERSION=1.24.8 +ARG GO_VERSION=1.24.9 ARG GO_IMAGE_VARIANT="bookworm" ARG TAGPREFIX="cmd/cli/" From 01742418b26ffe6afe86ecf14a2d02c4ae8593b9 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Tue, 14 Oct 2025 11:06:07 +0200 Subject: [PATCH 2/3] update go to 1.25.3 Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- docker-bake.hcl | 4 ++-- pkg/docker-cli/Dockerfile | 2 +- pkg/docker-engine/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 4018dfbf..7d6b2785 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -560,7 +560,7 @@ target "_pkg-docker-cli" { PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-ce-cli" PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/cli.git" PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master" - GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25.2" # https://github.com/docker/cli/blob/d16defd9e237a02e4e8b8710d9ce4a15472e60c8/Dockerfile#L11 + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25.3" # https://github.com/docker/cli/blob/d16defd9e237a02e4e8b8710d9ce4a15472e60c8/Dockerfile#L11 GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm" PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5" } @@ -571,7 +571,7 @@ target "_pkg-docker-engine" { PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-ce" PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/docker.git" PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master" - GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25.2" # https://github.com/moby/moby/blob/4b978319922166bab9116b3e60e716a62b9cf130/Dockerfile#L3 + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25.3" # https://github.com/moby/moby/blob/4b978319922166bab9116b3e60e716a62b9cf130/Dockerfile#L3 GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm" PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5" } diff --git a/pkg/docker-cli/Dockerfile b/pkg/docker-cli/Dockerfile index bef36257..2394f7ea 100644 --- a/pkg/docker-cli/Dockerfile +++ b/pkg/docker-cli/Dockerfile @@ -32,7 +32,7 @@ ARG PKG_REPO="https://github.com/docker/cli.git" ARG PKG_REF="master" ARG GO_IMAGE="golang" -ARG GO_VERSION=1.25.2 +ARG GO_VERSION=1.25.3 ARG GO_IMAGE_VARIANT="bookworm" # stage used as named context that mounts hack/scripts diff --git a/pkg/docker-engine/Dockerfile b/pkg/docker-engine/Dockerfile index 6cf1b326..1bd667f0 100644 --- a/pkg/docker-engine/Dockerfile +++ b/pkg/docker-engine/Dockerfile @@ -32,7 +32,7 @@ ARG PKG_REPO="https://github.com/docker/docker.git" ARG PKG_REF="master" ARG GO_IMAGE="golang" -ARG GO_VERSION=1.25.2 +ARG GO_VERSION=1.25.3 ARG GO_IMAGE_VARIANT="bookworm" # stage used as named context that mounts hack/scripts From a2be36385a34e0c8cf208f0b3c4f1d36b2e481e5 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Tue, 14 Oct 2025 11:07:25 +0200 Subject: [PATCH 3/3] pkg(buildx): update go to 1.25.3 Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- docker-bake.hcl | 2 +- pkg/buildx/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 7d6b2785..885e9843 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -516,7 +516,7 @@ target "_pkg-buildx" { PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-buildx-plugin" PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/buildx.git" PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master" - GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.9" # https://github.com/docker/buildx/blob/0c747263ef1426f5fa217fcdb616eddf33da6c2d/Dockerfile#L3 + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25.3" # https://github.com/docker/buildx/blob/854a58a65d5ada26ddc8b6ebd60ddb89fa5616a3/Dockerfile#L3 GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm" PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "" } diff --git a/pkg/buildx/Dockerfile b/pkg/buildx/Dockerfile index 6fbf77ad..877deba2 100644 --- a/pkg/buildx/Dockerfile +++ b/pkg/buildx/Dockerfile @@ -29,7 +29,7 @@ ARG PKG_REPO="https://github.com/docker/buildx.git" ARG PKG_REF="master" ARG GO_IMAGE="golang" -ARG GO_VERSION=1.24.9 +ARG GO_VERSION=1.25.3 ARG GO_IMAGE_VARIANT="bookworm" # stage used as named context that mounts hack/scripts