Skip to content

Commit 81eae31

Browse files
authored
Merge pull request #330 from docker/bot/update-go
chore: align go version from upstream repositories
2 parents f64f592 + 24d6390 commit 81eae31

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
@@ -571,7 +571,7 @@ target "_pkg-docker-cli" {
571571
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-ce-cli"
572572
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/cli.git"
573573
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
574-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25.4" # https://github.com/docker/cli/blob/master/Dockerfile
574+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25.5" # https://github.com/docker/cli/blob/master/Dockerfile
575575
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
576576
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
577577
PKG_REMOTE_DOCKERFILE = "Dockerfile"
@@ -583,7 +583,7 @@ target "_pkg-docker-engine" {
583583
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-ce"
584584
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/docker.git"
585585
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
586-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25.4" # https://github.com/moby/moby/blob/master/Dockerfile
586+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25.5" # https://github.com/moby/moby/blob/master/Dockerfile
587587
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
588588
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
589589
PKG_REMOTE_DOCKERFILE = "Dockerfile"

pkg/docker-cli/Dockerfile

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

3434
ARG GO_IMAGE="golang"
35-
ARG GO_VERSION="1.25.4"
35+
ARG GO_VERSION="1.25.5"
3636
ARG GO_IMAGE_VARIANT="bookworm"
3737

3838
# 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
@@ -32,7 +32,7 @@ ARG PKG_REPO="https://github.com/docker/docker.git"
3232
ARG PKG_REF="master"
3333

3434
ARG GO_IMAGE="golang"
35-
ARG GO_VERSION="1.25.4"
35+
ARG GO_VERSION="1.25.5"
3636
ARG GO_IMAGE_VARIANT="bookworm"
3737

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

0 commit comments

Comments
 (0)