Skip to content

Commit 1aa0b05

Browse files
authored
Merge pull request #394 from docker/bot/update-go
chore: align go version from upstream repositories
2 parents d936a2a + 2f6b02b commit 1aa0b05

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

docker-bake.hcl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ target "_pkg-buildx" {
494494
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-buildx-plugin"
495495
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/buildx.git"
496496
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
497-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25" # https://github.com/docker/buildx/blob/master/Dockerfile
497+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26" # https://github.com/docker/buildx/blob/master/Dockerfile
498498
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
499499
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : ""
500500
PKG_REMOTE_DOCKERFILE = "Dockerfile"
@@ -518,7 +518,7 @@ target "_pkg-containerd" {
518518
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "containerd.io"
519519
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/containerd/containerd.git"
520520
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main"
521-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25.8" # https://github.com/containerd/containerd/blob/main/.github/workflows/release/Dockerfile
521+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.0" # https://github.com/containerd/containerd/blob/main/.github/workflows/release/Dockerfile
522522
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
523523
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : ""
524524
RUNC_REF = RUNC_REF != null && RUNC_REF != "" ? RUNC_REF : null
@@ -594,9 +594,9 @@ function "pkgPlatforms" {
594594
buildx = ["darwin/amd64", "darwin/arm64", "linux/amd64", "linux/arm/v6", "linux/arm/v7", "linux/arm64", "linux/ppc64le", "linux/riscv64", "linux/s390x", "windows/amd64", "windows/arm64"]
595595
# https://github.com/docker/compose/blob/c626befee1596abcc74578cb10dd96ae1667f76f/docker-bake.hcl#L112-L124
596596
compose = ["darwin/amd64", "darwin/arm64", "linux/amd64", "linux/arm/v6", "linux/arm/v7", "linux/arm64", "linux/ppc64le", "linux/riscv64", "linux/s390x", "windows/amd64", "windows/arm64"]
597-
# https://github.com/containerd/containerd/blob/87742bd35f6ddc47c638a448c271b7ccf8df9010/.github/workflows/ci.yml#L145-L165
598-
# https://github.com/containerd/containerd/blob/87742bd35f6ddc47c638a448c271b7ccf8df9010/.github/workflows/ci.yml#L135-L137
599-
containerd = ["linux/amd64", "linux/arm/v6", "linux/arm/v7", "linux/arm64", "linux/ppc64le", "linux/s390x", "windows/amd64", "windows/arm64", "windows/arm/v7"]
597+
# https://github.com/containerd/containerd/blob/e373060a953aeaa35554e2f667043fed73ff6248/.github/workflows/ci.yml#L142-L162
598+
# https://github.com/containerd/containerd/blob/e373060a953aeaa35554e2f667043fed73ff6248/.github/workflows/ci.yml#L133-L134
599+
containerd = ["linux/amd64", "linux/arm/v6", "linux/arm/v7", "linux/arm64", "linux/ppc64le", "linux/s390x", "windows/amd64", "windows/arm64"]
600600
# https://github.com/docker/docker-credential-helpers/blob/f9d3010165b642df37215b1be945552f2c6f0e3b/docker-bake.hcl#L56-L66
601601
credential-helpers = ["darwin/amd64", "darwin/arm64", "linux/amd64", "linux/arm/v6", "linux/arm/v7", "linux/arm64", "linux/ppc64le", "linux/s390x", "windows/amd64"]
602602
# https://github.com/docker/cli/blob/84038691220e7ba3329a177e4e3357b4ee0e3a52/docker-bake.hcl#L30-L42

pkg/buildx/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ARG PKG_REPO="https://github.com/docker/buildx.git"
2828
ARG PKG_REF="master"
2929

3030
ARG GO_IMAGE="golang"
31-
ARG GO_VERSION="1.25"
31+
ARG GO_VERSION="1.26"
3232
ARG GO_IMAGE_VARIANT="bookworm"
3333

3434
# 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
@@ -34,7 +34,7 @@ ARG PKG_REPO="https://github.com/containerd/containerd.git"
3434
ARG PKG_REF="main"
3535

3636
ARG GO_IMAGE="golang"
37-
ARG GO_VERSION="1.25.8"
37+
ARG GO_VERSION="1.26.0"
3838
ARG GO_IMAGE_VARIANT="bookworm"
3939

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

0 commit comments

Comments
 (0)