diff --git a/docker-bake.hcl b/docker-bake.hcl index 2544065a..b22c7736 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -139,7 +139,7 @@ variable "GO_IMAGE" { } variable "GO_VERSION" { description = "Go version to use for building packages." - default = "1.24.4" + default = "1.24.6" } variable "GO_IMAGE_VARIANT" { description = "Go image variant to use for building packages." @@ -429,7 +429,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.4" # https://github.com/docker/buildx/blob/0c747263ef1426f5fa217fcdb616eddf33da6c2d/Dockerfile#L3 + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.6" # 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 : "5" } @@ -440,7 +440,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.23.8" # https://github.com/docker/compose/blob/c626befee1596abcc74578cb10dd96ae1667f76f/Dockerfile#L18 + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.23.12" # https://github.com/docker/compose/blob/c2cb0aef6bbbe1afc8c9e81267621655ac90c5f6/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 : "5" } @@ -451,7 +451,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.3" # https://github.com/containerd/containerd/blob/5a8ab17048d99821fc72b9fe32e32d7a51ae075d/.github/workflows/release.yml#L16 + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.6" # https://github.com/containerd/containerd/blame/822fb144732946f2a6f7998bfe748ed175674ade/.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 : "5" } @@ -462,7 +462,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.23.6" # https://github.com/docker/docker-credential-helpers/blob/f9d3010165b642df37215b1be945552f2c6f0e3b/Dockerfile#L3 + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.23.12" # https://github.com/docker/docker-credential-helpers/blob/f9d3010165b642df37215b1be945552f2c6f0e3b/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" } @@ -473,7 +473,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.24.3" # https://github.com/docker/cli/blob/84038691220e7ba3329a177e4e3357b4ee0e3a52/Dockerfile#L7 + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.6" # 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" } @@ -484,7 +484,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.24.4" # https://github.com/moby/moby/blob/83264918d3e1c61341511e360a7277150b914b3f/Dockerfile#L3 + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.6" # 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" } @@ -495,7 +495,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-cli.git" PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main" - GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.4" # https://github.com/docker/model-cli/blob/301126afc8ef4b8330de56db5d2889ddbc978022/Dockerfile#L3 + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.6" # https://github.com/docker/model-cli/blob/301126afc8ef4b8330de56db5d2889ddbc978022/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/buildx/Dockerfile b/pkg/buildx/Dockerfile index f7d27cde..7297b125 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.4" +ARG GO_VERSION="1.24.6" 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 d3ff2a47..b352c45c 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.23.8" +ARG GO_VERSION="1.23.12" 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 8ae60dda..0dc57642 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.3" +ARG GO_VERSION="1.24.6" 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 5d6d2e7b..9719ed35 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.23.6" +ARG GO_VERSION="1.23.12" ARG GO_IMAGE_VARIANT="bookworm" # stage used as named context that mounts hack/scripts diff --git a/pkg/docker-cli/Dockerfile b/pkg/docker-cli/Dockerfile index 2d8b8b16..1a048e7e 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.24.3" +ARG GO_VERSION="1.24.6" 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 62c3f1d4..e4cebb28 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.24.4" +ARG GO_VERSION="1.24.6" 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 8a25adfa..a9ba43e5 100644 --- a/pkg/model/Dockerfile +++ b/pkg/model/Dockerfile @@ -29,7 +29,7 @@ ARG PKG_REPO="https://github.com/docker/model-cli.git" ARG PKG_REF="main" ARG GO_IMAGE="golang" -ARG GO_VERSION="1.24.4" +ARG GO_VERSION="1.24.6" ARG GO_IMAGE_VARIANT="bookworm" # stage used as named context that mounts hack/scripts