Skip to content

Commit d21bba2

Browse files
authored
Merge pull request #400 from docker/bot/update-go
chore: align go version from upstream repositories
2 parents 2efee8e + 5e28300 commit d21bba2

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

docker-bake.hcl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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.26.0" # https://github.com/containerd/containerd/blob/main/.github/workflows/release/Dockerfile
521+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.2" # 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
@@ -543,7 +543,7 @@ target "_pkg-docker-cli" {
543543
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-ce-cli"
544544
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/cli.git"
545545
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
546-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.1" # https://github.com/docker/cli/blob/master/Dockerfile
546+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.2" # https://github.com/docker/cli/blob/master/Dockerfile
547547
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
548548
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
549549
PKG_REMOTE_DOCKERFILE = "Dockerfile"
@@ -555,7 +555,7 @@ target "_pkg-docker-engine" {
555555
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-ce"
556556
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/docker.git"
557557
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
558-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.1" # https://github.com/moby/moby/blob/master/Dockerfile
558+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.2" # https://github.com/moby/moby/blob/master/Dockerfile
559559
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
560560
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
561561
PKG_REMOTE_DOCKERFILE = "Dockerfile"

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.26.0"
37+
ARG GO_VERSION="1.26.2"
3838
ARG GO_IMAGE_VARIANT="bookworm"
3939

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

pkg/docker-cli/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ARG PKG_REPO="https://github.com/docker/cli.git"
3131
ARG PKG_REF="master"
3232

3333
ARG GO_IMAGE="golang"
34-
ARG GO_VERSION="1.26.1"
34+
ARG GO_VERSION="1.26.2"
3535
ARG GO_IMAGE_VARIANT="bookworm"
3636

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

pkg/docker-engine/Dockerfile

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

3333
ARG GO_IMAGE="golang"
34-
ARG GO_VERSION="1.26.1"
34+
ARG GO_VERSION="1.26.2"
3535
ARG GO_IMAGE_VARIANT="bookworm"
3636

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

0 commit comments

Comments
 (0)