Skip to content

Commit 782aa24

Browse files
authored
Merge pull request #474 from docker/bot/update-go
chore: align go version from upstream repositories
2 parents 25eeaf8 + 287e0c3 commit 782aa24

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
@@ -602,7 +602,7 @@ target "_pkg-credential-helpers" {
602602
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-credential-helpers"
603603
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/docker-credential-helpers.git"
604604
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main"
605-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.4" # https://github.com/docker/docker-credential-helpers/blob/main/Dockerfile
605+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.5" # https://github.com/docker/docker-credential-helpers/blob/main/Dockerfile
606606
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
607607
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : ""
608608
PKG_REMOTE_DOCKERFILE = "Dockerfile"
@@ -614,7 +614,7 @@ target "_pkg-docker-cli" {
614614
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-ce-cli"
615615
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/cli.git"
616616
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
617-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.4" # https://github.com/docker/cli/blob/master/Dockerfile
617+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.5" # https://github.com/docker/cli/blob/master/Dockerfile
618618
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
619619
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
620620
PKG_REMOTE_DOCKERFILE = "Dockerfile"
@@ -626,7 +626,7 @@ target "_pkg-docker-engine" {
626626
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-ce"
627627
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/docker.git"
628628
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
629-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.4" # https://github.com/moby/moby/blob/master/Dockerfile
629+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.26.5" # https://github.com/moby/moby/blob/master/Dockerfile
630630
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
631631
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
632632
PKG_REMOTE_DOCKERFILE = "Dockerfile"

‎pkg/credential-helpers/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/docker-credential-helpers.git"
2929
ARG PKG_REF="main"
3030

3131
ARG GO_IMAGE="golang"
32-
ARG GO_VERSION="1.26.4"
32+
ARG GO_VERSION="1.26.5"
3333
ARG GO_IMAGE_VARIANT="bookworm"
3434

3535
# 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.4"
34+
ARG GO_VERSION="1.26.5"
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.4"
34+
ARG GO_VERSION="1.26.5"
3535
ARG GO_IMAGE_VARIANT="bookworm"
3636

3737
ARG TAGPREFIX="docker-"

0 commit comments

Comments
 (0)