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

vendor: github.com/moby/buildkit v0.10.3 #43571

Merged
merged 2 commits into from May 20, 2022
Merged

vendor: github.com/moby/buildkit v0.10.3 #43571

merged 2 commits into from May 20, 2022

Conversation

crazy-max
Copy link
Member

thaJeztah
thaJeztah approved these changes May 9, 2022
View reviewed changes
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 green)

@thaJeztah thaJeztah added this to the 22.04.0 milestone May 9, 2022
@crazy-max
Copy link
Member Author

crazy-max commented May 9, 2022 •
edited

https://github.com/moby/moby/runs/6351676790?check_suite_focus=true#step:9:2591

=== CONT  TestIntegration/TestNamedImageContext/worker=dockerd/frontend=builtin
2022/05/09 12:35:37 http2: server connection error from localhost: connection error: PROTOCOL_ERROR
    dockerfile_test.go:5380: 
        	Error Trace:	dockerfile_test.go:5380
        	            				run.go:88
        	            				run.go:202
        	Error:      	Received unexpected error:
        	            	exporter "image" could not be found
        	            	github.com/moby/buildkit/util/stack.Enable
        	            		/src/util/stack/stack.go:77

Looks like changes in TestNamedImageContext are not working with dockerd worker: moby/buildkit#2847.
cc @cpuguy83 @tonistiigi

Triggered a build to test dockerd worker on buildkit repo against v0.10 to check that: https://github.com/moby/buildkit/actions/runs/2294293423

@crazy-max
Copy link
Member Author

Confirmed that it's broken upstream so should be fixed on BuildKit: https://github.com/moby/buildkit/runs/6352229776?check_suite_focus=true#step:9:2750

@crazy-max crazy-max mentioned this pull request May 9, 2022
Merged
@crazy-max crazy-max marked this pull request as draft May 9, 2022 19:54
@thaJeztah thaJeztah mentioned this pull request May 19, 2022
Merged
crazy-max and others added 2 commits May 19, 2022 23:31
@crazy-max @thaJeztah
vendor: github.com/moby/buildkit v0.10.3
90fb4ec 
full diff: moby/buildkit@v0.10.2...v0.10.3

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
gha: temporarily override buildkit version for tests
80862d6 
This includes a single fix that only affects the tests, so using
a temporary override to update the tests to make CI pass, but keeping
the module version to the tagged release.

https://github.com/moby/buildkit/compare/v0.10.3..0da740f7d4f782a52b416a44f564ac37504b9ee1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member

I did a quick rebase, and included a temporary commit that overrides the version that's used in CI (for running the tests); we can remove that when we update to buildkit v0.10.4 (or a newer released version); trying to keep the module version to tagged releases if possible.

@thaJeztah thaJeztah marked this pull request as ready for review May 19, 2022 22:35
@crazy-max
Copy link
Member Author

LGTM

@thaJeztah thaJeztah merged commit 2cfbb03 into moby:master May 20, 2022
@crazy-max crazy-max deleted the vendor-buildkit-0.10.3 branch May 23, 2022 21:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@crazy-max @thaJeztah