Skip to content
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

Jump to bottom

[24.0 backport] vendor: github.com/moby/buildkit v0.11.7-0.20230525183624-798ad6b0ce9f #45582

Merged
merged 1 commit into from
May 25, 2023
Merged

[24.0 backport] vendor: github.com/moby/buildkit v0.11.7-0.20230525183624-798ad6b0ce9f #45582

merged 1 commit into from
May 25, 2023

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented May 19, 2023 •
edited

relates to / addresses:

full diff: moby/buildkit@v0.11.6...798ad6b

- What I did

- How I did it

- How to verify it

- Description for the changelog

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

@thaJeztah thaJeztah added this to the 24.0.1 milestone May 19, 2023
thaJeztah
thaJeztah commented May 19, 2023
View reviewed changes
builder/builder-next/worker/worker.go Outdated
version.Version = "v0.11.6"
version.Version = "v0.11.7-0.20230519102302-348e79dfed17"
Copy link
Member Author

Choose a reason for hiding this comment

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

Do we prefer the go module version for this, or git describe ?

git describe --tags
v0.11.6-4-g348e79dfe

Copy link
Member

Choose a reason for hiding this comment

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

Not near my PC but maybe we could backport #45304 to 24.0 branch, WDYT?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, didn't want to jinx it. And it looks like we don't need this intermediate version, so updating it to v0.11.7 (once it's released) isn't too much of a hassle for now I guess.

@thaJeztah
Copy link
Member Author

Discussing with @jedevc, and these fixes are only needed on the client-side, so no need (for now) to backport

@thaJeztah thaJeztah marked this pull request as draft May 19, 2023 11:33
@thaJeztah

This comment was marked as resolved.

Sign in to view
@thaJeztah thaJeztah mentioned this pull request May 19, 2023
Closed
@thaJeztah thaJeztah modified the milestones: 24.0.1, 24.0.2 May 19, 2023
AkihiroSuda
AkihiroSuda reviewed May 22, 2023
View reviewed changes
builder/builder-next/worker/worker.go Outdated
@@ -50,7 +50,7 @@ import (
)

func init() {
version.Version = "v0.11.6"
version.Version = "v0.11.7-0.20230519102302-348e79dfed17"
Copy link
Member

Choose a reason for hiding this comment

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

Is there any specific reason to backport a non-tagged commit?
Can we just release v0.11.7?

Copy link
Member Author

Choose a reason for hiding this comment

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

I opened this one because there was a possible regression in Docker 24.0; I wasn't 100% sure if that only needed changes on the client-side (buildx), or also needed fixes on the daemon side.

We were preparing the 24.0.1 release, and there was no ETA yet for v0.11.7, so I prepared the vending updates. However, discussing with Jed and Tonis, it turned out that we didn't need changes on the daemon side, so I moved this one back to draft (and can probably close it until there's a v0.11.7 release); #45582 (comment)

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated this PR, because we found another issue that did result in a panic, docker/buildx#1836

@thaJeztah
vendor: github.com/moby/buildkit v0.11.7-0.20230525183624-798ad6b0ce9f
ae6e933 
full diff: moby/buildkit@v0.11.6...798ad6b

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 79ca663)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 24.0_backport_vendor_buildkit_0.11.7_dev branch from 0e92efb to ae6e933 Compare May 25, 2023 19:46
@thaJeztah thaJeztah changed the title [24.0 backport] vendor: github.com/moby/buildkit v0.11.7-0.20230519102302-348e79dfed17 [24.0 backport] vendor: github.com/moby/buildkit v0.11.7-0.20230525183624-798ad6b0ce9f May 25, 2023
@thaJeztah thaJeztah marked this pull request as ready for review May 25, 2023 19:48
@thaJeztah
Copy link
Member Author

Failure on Windows: looks like potential race? (logs logs logs missing in output); ISTR this test was flaky before

=== FAIL: github.com/docker/docker/integration/container TestHealthCheckProcessKilled (3.02s)
    health_test.go:111: polling check failed: expected "Health check exceeded timeout (50ms): logs logs logs\n", got "Health check exceeded timeout (50ms)"

@thaJeztah
Copy link
Member Author

All green now 👍

@thaJeztah thaJeztah merged commit 6660133 into moby:24.0 May 25, 2023
101 checks passed
@thaJeztah thaJeztah deleted the 24.0_backport_vendor_buildkit_0.11.7_dev branch May 25, 2023 21:03
@thaJeztah thaJeztah mentioned this pull request Jun 7, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crazy-max crazy-max crazy-max left review comments

@AkihiroSuda AkihiroSuda AkihiroSuda left review comments

@tonistiigi tonistiigi tonistiigi approved these changes

@neersighted neersighted neersighted approved these changes

Assignees
No one assigned
Labels
area/builder/buildkit Issues affecting buildkit area/builder impact/changelog status/4-merge
Projects
None yet
Milestone
24.0.2
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@thaJeztah @tonistiigi @neersighted @crazy-max @AkihiroSuda