Skip to content

Commit f64f592

Browse files
authored
Merge pull request #323 from docker/bot/update-go
chore: align go version from upstream repositories
2 parents f9d248c + d4094bf commit f64f592

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

docker-bake.hcl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ target "_pkg-buildx" {
522522
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-buildx-plugin"
523523
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/buildx.git"
524524
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
525-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25.3" # https://github.com/docker/buildx/blob/master/Dockerfile
525+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25" # https://github.com/docker/buildx/blob/master/Dockerfile
526526
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
527527
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : ""
528528
PKG_REMOTE_DOCKERFILE = "Dockerfile"
@@ -559,7 +559,7 @@ target "_pkg-credential-helpers" {
559559
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-credential-helpers"
560560
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/docker-credential-helpers.git"
561561
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
562-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25.3" # https://github.com/docker/docker-credential-helpers/blob/master/Dockerfile
562+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25.2" # https://github.com/docker/docker-credential-helpers/blob/master/Dockerfile
563563
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
564564
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : ""
565565
PKG_REMOTE_DOCKERFILE = "Dockerfile"
@@ -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.3" # https://github.com/docker/cli/blob/master/Dockerfile
574+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25.4" # 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.3" # https://github.com/moby/moby/blob/master/Dockerfile
586+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.25.4" # 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"
@@ -595,7 +595,7 @@ target "_pkg-model" {
595595
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-model-plugin"
596596
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/model-runner.git"
597597
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main"
598-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.9" # https://github.com/docker/model-runner/blob/main/cmd/cli/Dockerfile
598+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24" # https://github.com/docker/model-runner/blob/main/cmd/cli/Dockerfile
599599
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
600600
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : ""
601601
PKG_REMOTE_DOCKERFILE = "Dockerfile"

pkg/buildx/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/buildx.git"
2929
ARG PKG_REF="master"
3030

3131
ARG GO_IMAGE="golang"
32-
ARG GO_VERSION=1.25.4
32+
ARG GO_VERSION="1.25"
3333
ARG GO_IMAGE_VARIANT="bookworm"
3434

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

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.9"
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.9"
3939
ARG GO_IMAGE_VARIANT="bookworm"
4040

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

pkg/credential-helpers/Dockerfile

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

3232
ARG GO_IMAGE="golang"
33-
ARG GO_VERSION=1.24.9
33+
ARG GO_VERSION="1.25.2"
3434
ARG GO_IMAGE_VARIANT="bookworm"
3535

3636
# 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
@@ -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.4"
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.4"
3636
ARG GO_IMAGE_VARIANT="bookworm"
3737

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

pkg/model/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/model-runner.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"
3333
ARG GO_IMAGE_VARIANT="bookworm"
3434

3535
ARG TAGPREFIX="cmd/cli/"

0 commit comments

Comments
 (0)