Skip to content

Commit d80aa5d

Browse files
authored
Merge pull request #331 from docker/bot/update-go
chore: align go version from upstream repositories
2 parents 81eae31 + 2180ec9 commit d80aa5d

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

docker-bake.hcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ target "_pkg-compose" {
534534
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-compose-plugin"
535535
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/compose.git"
536536
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main"
537-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.9" # https://github.com/docker/compose/blob/main/Dockerfile
537+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.11" # https://github.com/docker/compose/blob/main/Dockerfile
538538
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
539539
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : ""
540540
PKG_REMOTE_DOCKERFILE = "Dockerfile"
@@ -546,7 +546,7 @@ target "_pkg-containerd" {
546546
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "containerd.io"
547547
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/containerd/containerd.git"
548548
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main"
549-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.9" # https://github.com/containerd/containerd/blob/main/.github/workflows/release/Dockerfile
549+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.11" # https://github.com/containerd/containerd/blob/main/.github/workflows/release/Dockerfile
550550
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
551551
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : ""
552552
RUNC_REF = RUNC_REF != null && RUNC_REF != "" ? RUNC_REF : null

pkg/compose/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ARG PKG_REPO="https://github.com/docker/compose.git"
2929
ARG PKG_REF="main"
3030

3131
ARG GO_IMAGE="golang"
32-
ARG GO_VERSION="1.24.9"
32+
ARG GO_VERSION="1.24.11"
3333
ARG GO_IMAGE_VARIANT="bookworm"
3434

3535
# stage used as named context that mounts hack/scripts

pkg/containerd/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ ARG PKG_REPO="https://github.com/containerd/containerd.git"
3535
ARG PKG_REF="main"
3636

3737
ARG GO_IMAGE="golang"
38-
ARG GO_VERSION="1.24.9"
38+
ARG GO_VERSION="1.24.11"
3939
ARG GO_IMAGE_VARIANT="bookworm"
4040

4141
# stage used as named context that mounts hack/scripts

0 commit comments

Comments
 (0)