Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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.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 : ""
}
Expand All @@ -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 : ""
}
Expand All @@ -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 : ""
}
Expand All @@ -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 : ""
}
Expand All @@ -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"
}
Expand All @@ -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"
}
Expand All @@ -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 : ""
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/buildx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.25.3
ARG GO_IMAGE_VARIANT="bookworm"

# stage used as named context that mounts hack/scripts
Expand Down
2 changes: 1 addition & 1 deletion pkg/compose/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/containerd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/credential-helpers/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-engine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down