Skip to content

Bump golang 1.23.12, 1.24.6 #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crazy-max merged 8 commits into from
Aug 11, 2025
Merged

Bump golang 1.23.12, 1.24.6 #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dceab3c
pkg(compose): bump go to 1.23.12
austinvazquez Aug 8, 2025
95dede1
pkg(credential-helpers): bump go to 1.23.12
austinvazquez Aug 8, 2025
9d1f49a
bump default go version to 1.24.6
austinvazquez Aug 8, 2025
a65a831
pkg(containerd): bump go to 1.24.6
austinvazquez Aug 8, 2025
509ca06
pkg(docker-cli): bump go to 1.24.6
austinvazquez Aug 8, 2025
9e11c13
pkg(docker-engine): bump go to 1.24.6
austinvazquez Aug 8, 2025
5bdbb0b
pkg(buildx): bump go to 1.24.6
austinvazquez Aug 8, 2025
7177aea
pkg(model-cli): bump go to 1.24.6
austinvazquez Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ variable "GO_IMAGE" {
}
variable "GO_VERSION" {
description = "Go version to use for building packages."
default = "1.24.4"
default = "1.24.6"
}
variable "GO_IMAGE_VARIANT" {
description = "Go image variant to use for building packages."
Expand Down Expand Up @@ -429,7 +429,7 @@ target "_pkg-buildx" {
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-buildx-plugin"
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/buildx.git"
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.4" # https://github.com/docker/buildx/blob/0c747263ef1426f5fa217fcdb616eddf33da6c2d/Dockerfile#L3
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.6" # https://github.com/docker/buildx/blob/0c747263ef1426f5fa217fcdb616eddf33da6c2d/Dockerfile#L3
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
}
Expand All @@ -440,7 +440,7 @@ target "_pkg-compose" {
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-compose-plugin"
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/compose.git"
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main"
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.23.8" # https://github.com/docker/compose/blob/c626befee1596abcc74578cb10dd96ae1667f76f/Dockerfile#L18
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.23.12" # https://github.com/docker/compose/blob/c2cb0aef6bbbe1afc8c9e81267621655ac90c5f6/Dockerfile#L18
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
}
Expand All @@ -451,7 +451,7 @@ target "_pkg-containerd" {
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "containerd.io"
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/containerd/containerd.git"
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main"
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.3" # https://github.com/containerd/containerd/blob/5a8ab17048d99821fc72b9fe32e32d7a51ae075d/.github/workflows/release.yml#L16
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.6" # https://github.com/containerd/containerd/blame/822fb144732946f2a6f7998bfe748ed175674ade/.github/workflows/release.yml#L16
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
}
Expand All @@ -462,7 +462,7 @@ target "_pkg-credential-helpers" {
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-credential-helpers"
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/docker-credential-helpers.git"
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.23.6" # https://github.com/docker/docker-credential-helpers/blob/f9d3010165b642df37215b1be945552f2c6f0e3b/Dockerfile#L3
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.23.12" # https://github.com/docker/docker-credential-helpers/blob/f9d3010165b642df37215b1be945552f2c6f0e3b/Dockerfile#L3
Copy link
Member

@crazy-max crazy-max Aug 11, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one still pins to 1.23.6 so would need upstream update as well.

Copy link
Member

@thaJeztah thaJeztah Aug 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(but we can start looking at updating it to go1.24)

GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
}
Expand All @@ -473,7 +473,7 @@ target "_pkg-docker-cli" {
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-ce-cli"
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/cli.git"
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.3" # https://github.com/docker/cli/blob/84038691220e7ba3329a177e4e3357b4ee0e3a52/Dockerfile#L7
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.6" # https://github.com/docker/cli/blob/d16defd9e237a02e4e8b8710d9ce4a15472e60c8/Dockerfile#L11
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
}
Expand All @@ -484,7 +484,7 @@ target "_pkg-docker-engine" {
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-ce"
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/docker.git"
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "master"
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.4" # https://github.com/moby/moby/blob/83264918d3e1c61341511e360a7277150b914b3f/Dockerfile#L3
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.6" # https://github.com/moby/moby/blob/4b978319922166bab9116b3e60e716a62b9cf130/Dockerfile#L3
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
}
Expand All @@ -495,7 +495,7 @@ target "_pkg-model" {
PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "docker-model-plugin"
PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/docker/model-cli.git"
PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main"
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.4" # https://github.com/docker/model-cli/blob/301126afc8ef4b8330de56db5d2889ddbc978022/Dockerfile#L3
GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.6" # https://github.com/docker/model-cli/blob/301126afc8ef4b8330de56db5d2889ddbc978022/Dockerfile#L3
GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : "5"
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/buildx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ARG PKG_REPO="https://github.com/docker/buildx.git"
ARG PKG_REF="master"

ARG GO_IMAGE="golang"
ARG GO_VERSION="1.24.4"
ARG GO_VERSION="1.24.6"
ARG GO_IMAGE_VARIANT="bookworm"

# stage used as named context that mounts hack/scripts
Expand Down
2 changes: 1 addition & 1 deletion pkg/compose/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ARG PKG_REPO="https://github.com/docker/compose.git"
ARG PKG_REF="main"

ARG GO_IMAGE="golang"
ARG GO_VERSION="1.23.8"
ARG GO_VERSION="1.23.12"
ARG GO_IMAGE_VARIANT="bookworm"

# stage used as named context that mounts hack/scripts
Expand Down
2 changes: 1 addition & 1 deletion pkg/containerd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ARG PKG_REPO="https://github.com/containerd/containerd.git"
ARG PKG_REF="main"

ARG GO_IMAGE="golang"
ARG GO_VERSION="1.24.3"
ARG GO_VERSION="1.24.6"
ARG GO_IMAGE_VARIANT="bookworm"

# stage used as named context that mounts hack/scripts
Expand Down
2 changes: 1 addition & 1 deletion pkg/credential-helpers/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ARG PKG_REPO="https://github.com/docker/docker-credential-helpers.git"
ARG PKG_REF="master"

ARG GO_IMAGE="golang"
ARG GO_VERSION="1.23.6"
ARG GO_VERSION="1.23.12"
ARG GO_IMAGE_VARIANT="bookworm"

# stage used as named context that mounts hack/scripts
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ARG PKG_REPO="https://github.com/docker/cli.git"
ARG PKG_REF="master"

ARG GO_IMAGE="golang"
ARG GO_VERSION="1.24.3"
ARG GO_VERSION="1.24.6"
ARG GO_IMAGE_VARIANT="bookworm"

# stage used as named context that mounts hack/scripts
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-engine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ARG PKG_REPO="https://github.com/docker/docker.git"
ARG PKG_REF="master"

ARG GO_IMAGE="golang"
ARG GO_VERSION="1.24.4"
ARG GO_VERSION="1.24.6"
ARG GO_IMAGE_VARIANT="bookworm"

# stage used as named context that mounts hack/scripts
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ARG PKG_REPO="https://github.com/docker/model-cli.git"
ARG PKG_REF="main"

ARG GO_IMAGE="golang"
ARG GO_VERSION="1.24.4"
ARG GO_VERSION="1.24.6"
ARG GO_IMAGE_VARIANT="bookworm"

# stage used as named context that mounts hack/scripts
Expand Down