Skip to content

Commit 0c35fee

Browse files
crazy-maxcrazy-max
authored
Merge pull request #239 from austinvazquez/bump-golang-1.23.12-1.24.6
Bump golang 1.23.12, 1.24.6
2 parents d926568 + 7177aea commit 0c35fee

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

‎docker-bake.hcl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ variable "GO_IMAGE" {
139139
}
140140
variable "GO_VERSION" {
141141
description = "Go version to use for building packages."
142-
default = "1.24.4"
142+
default = "1.24.6"
143143
}
144144
variable "GO_IMAGE_VARIANT" {
145145
description = "Go image variant to use for building packages."
@@ -429,7 +429,7 @@ target "_pkg-buildx" {
429429
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-buildx-plugin"
430430
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/buildx.git"
431431
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
432-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.4" # https://github.com/docker/buildx/blob/0c747263ef1426f5fa217fcdb616eddf33da6c2d/Dockerfile#L3
432+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.6" # https://github.com/docker/buildx/blob/0c747263ef1426f5fa217fcdb616eddf33da6c2d/Dockerfile#L3
433433
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
434434
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
435435
}
@@ -440,7 +440,7 @@ target "_pkg-compose" {
440440
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-compose-plugin"
441441
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/compose.git"
442442
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main"
443-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.23.8" # https://github.com/docker/compose/blob/c626befee1596abcc74578cb10dd96ae1667f76f/Dockerfile#L18
443+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.23.12" # https://github.com/docker/compose/blob/c2cb0aef6bbbe1afc8c9e81267621655ac90c5f6/Dockerfile#L18
444444
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
445445
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
446446
}
@@ -451,7 +451,7 @@ target "_pkg-containerd" {
451451
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "containerd.io"
452452
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/containerd/containerd.git"
453453
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main"
454-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.3" # https://github.com/containerd/containerd/blob/5a8ab17048d99821fc72b9fe32e32d7a51ae075d/.github/workflows/release.yml#L16
454+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.6" # https://github.com/containerd/containerd/blame/822fb144732946f2a6f7998bfe748ed175674ade/.github/workflows/release.yml#L16
455455
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
456456
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
457457
}
@@ -462,7 +462,7 @@ target "_pkg-credential-helpers" {
462462
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-credential-helpers"
463463
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/docker-credential-helpers.git"
464464
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
465-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.23.6" # https://github.com/docker/docker-credential-helpers/blob/f9d3010165b642df37215b1be945552f2c6f0e3b/Dockerfile#L3
465+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.23.12" # https://github.com/docker/docker-credential-helpers/blob/f9d3010165b642df37215b1be945552f2c6f0e3b/Dockerfile#L3
466466
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
467467
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
468468
}
@@ -473,7 +473,7 @@ target "_pkg-docker-cli" {
473473
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-ce-cli"
474474
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/cli.git"
475475
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
476-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.3" # https://github.com/docker/cli/blob/84038691220e7ba3329a177e4e3357b4ee0e3a52/Dockerfile#L7
476+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.6" # https://github.com/docker/cli/blob/d16defd9e237a02e4e8b8710d9ce4a15472e60c8/Dockerfile#L11
477477
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
478478
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
479479
}
@@ -484,7 +484,7 @@ target "_pkg-docker-engine" {
484484
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-ce"
485485
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/docker.git"
486486
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
487-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.4" # https://github.com/moby/moby/blob/83264918d3e1c61341511e360a7277150b914b3f/Dockerfile#L3
487+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.6" # https://github.com/moby/moby/blob/4b978319922166bab9116b3e60e716a62b9cf130/Dockerfile#L3
488488
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
489489
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
490490
}
@@ -495,7 +495,7 @@ target "_pkg-model" {
495495
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-model-plugin"
496496
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/model-cli.git"
497497
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main"
498-
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.4" # https://github.com/docker/model-cli/blob/301126afc8ef4b8330de56db5d2889ddbc978022/Dockerfile#L3
498+
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.6" # https://github.com/docker/model-cli/blob/301126afc8ef4b8330de56db5d2889ddbc978022/Dockerfile#L3
499499
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
500500
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
501501
}

‎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.24.4"
32+
ARG GO_VERSION="1.24.6"
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.23.8"
32+
ARG GO_VERSION="1.23.12"
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.3"
38+
ARG GO_VERSION="1.24.6"
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.23.6"
33+
ARG GO_VERSION="1.23.12"
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.24.3"
35+
ARG GO_VERSION="1.24.6"
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.24.4"
35+
ARG GO_VERSION="1.24.6"
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-cli.git"
2929
ARG PKG_REF="main"
3030

3131
ARG GO_IMAGE="golang"
32-
ARG GO_VERSION="1.24.4"
32+
ARG GO_VERSION="1.24.6"
3333
ARG GO_IMAGE_VARIANT="bookworm"
3434

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

0 commit comments

Comments
 (0)