diff --git a/docker-bake.hcl b/docker-bake.hcl index cb17d3f0..497b7d8c 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -585,7 +585,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.26.6" # https://github.com/docker/compose/blob/main/Dockerfile + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.8" # https://github.com/docker/compose/blob/main/Dockerfile 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 : "" PKG_REMOTE_DOCKERFILE = "Dockerfile" @@ -625,7 +625,7 @@ target "_pkg-docker" { CLI_REPO = CLI_REPO != null && CLI_REPO != "" ? CLI_REPO : "https://github.com/docker/cli.git" CLI_REF = CLI_REF != null && CLI_REF != "" ? CLI_REF : "master" DOCKER_VERSION = DOCKER_VERSION - GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.7" # https://github.com/moby/moby/blob/master/Dockerfile + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.8" # https://github.com/moby/moby/blob/master/Dockerfile GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm" PKG_REMOTE_DOCKERFILE = "Dockerfile" } @@ -636,7 +636,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.26.7" # https://github.com/docker/cli/blob/master/Dockerfile + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.8" # https://github.com/docker/cli/blob/master/Dockerfile 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" PKG_REMOTE_DOCKERFILE = "Dockerfile" @@ -648,7 +648,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.26.7" # https://github.com/moby/moby/blob/master/Dockerfile + GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.8" # https://github.com/moby/moby/blob/master/Dockerfile 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" PKG_REMOTE_DOCKERFILE = "Dockerfile" diff --git a/pkg/compose/Dockerfile b/pkg/compose/Dockerfile index 09e5af0e..ff222b50 100644 --- a/pkg/compose/Dockerfile +++ b/pkg/compose/Dockerfile @@ -28,7 +28,7 @@ ARG PKG_REPO="https://github.com/docker/compose.git" ARG PKG_REF="main" ARG GO_IMAGE="golang" -ARG GO_VERSION="1.26.6" +ARG GO_VERSION="1.26.8" 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 972134a1..7b30954a 100644 --- a/pkg/docker-cli/Dockerfile +++ b/pkg/docker-cli/Dockerfile @@ -31,7 +31,7 @@ ARG PKG_REPO="https://github.com/docker/cli.git" ARG PKG_REF="master" ARG GO_IMAGE="golang" -ARG GO_VERSION="1.26.7" +ARG GO_VERSION="1.26.8" 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 1073e76f..7121e033 100644 --- a/pkg/docker-engine/Dockerfile +++ b/pkg/docker-engine/Dockerfile @@ -31,7 +31,7 @@ ARG PKG_REPO="https://github.com/docker/docker.git" ARG PKG_REF="master" ARG GO_IMAGE="golang" -ARG GO_VERSION="1.26.7" +ARG GO_VERSION="1.26.8" ARG GO_IMAGE_VARIANT="bookworm" ARG TAGPREFIX="docker-" diff --git a/pkg/docker/Dockerfile b/pkg/docker/Dockerfile index 96876bb1..eac7528b 100644 --- a/pkg/docker/Dockerfile +++ b/pkg/docker/Dockerfile @@ -37,7 +37,7 @@ ARG CLI_REF="master" ARG DOCKER_VERSION ARG GO_IMAGE="golang" -ARG GO_VERSION="1.26.7" +ARG GO_VERSION="1.26.8" ARG GO_IMAGE_VARIANT="bookworm" ARG TAGPREFIX="docker-"