Skip to content

[28.x backport] vendor: update buildkit to v0.23.1#50243

Merged
thaJeztah merged 2 commits intomoby:28.xfrom
vvoland:50238-28.x
Jun 20, 2025
Merged

[28.x backport] vendor: update buildkit to v0.23.1#50243
thaJeztah merged 2 commits intomoby:28.xfrom
vvoland:50238-28.x

Conversation

@vvoland
Copy link
Contributor

@vvoland vvoland commented Jun 20, 2025

- What I did

- How I did it

- How to verify it

- Human readable description for the release notes

Update BuildKit to [v0.23.1](https://github.com/moby/buildkit/releases/tag/v0.23.1)

- A picture of a cute animal (not mandatory but encouraged)

github.com/mistifyio/go-zfs/v3 v3.0.1
github.com/mitchellh/copystructure v1.2.0
github.com/moby/buildkit v0.23.0-rc2
github.com/moby/buildkit v0.23.1
Copy link
Member

Choose a reason for hiding this comment

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

This also includes #50222 ? Did we skip that commit?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We didn't backport the previous PR, but I don't think it's needed now?

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, mostly that we normally use the "cherry-pick -x" so that we have a clear reference to where it was backported from, so in this case, I'd have expected both commits to be found, leading to the original commits/PRs

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure if there's a real value in recording the intermediate commit, but updated the PR to also include it.

jsternberg and others added 2 commits June 20, 2025 16:04
Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
(cherry picked from commit e43968d)
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
(cherry picked from commit 5a02e7f)
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

if CI was green before this, we can probably merge without waiting for it to finish

@thaJeztah thaJeztah merged commit c571cd8 into moby:28.x Jun 20, 2025
259 of 261 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants