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.

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

vendor: github.com/moby/buildkit master (v0.14?) #47683

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

vvoland
Copy link
Contributor

@vvoland vvoland commented Apr 5, 2024

full diff: moby/buildkit@v0.13.1...5152118

A draft PR to follow changes on buildkit side.

Moby integration adjustments

builder: Pass nil linter to instructions.Parse

eea0b41bf4fb1d69e109ff5ff8045c63f0c0d510 added a new argument to
instructions.Parse to support issuing linter warnings.

Classic builder uses it to parse the Dockerfile instructions and its
usage needs adjustment.

The classic builder is deprecated and we won't be adding any new
features to it, so we just pass a nil linter callback.

builder: Adjust usage of shlex.ProcessWord

1b1c5bc08ad81add007eb647e66ed0929693f3a0 extended the function signature
with one additional return value.

Signed-off-by: Paweł Gronowski pawel.gronowski@docker.com

@vvoland vvoland added this to the v-future milestone Apr 5, 2024
@vvoland vvoland self-assigned this Apr 5, 2024
@vvoland vvoland force-pushed the buildkit-update branch 3 times, most recently from 6467cc5 to b51705c Compare April 25, 2024 09:47
@crazy-max
Copy link
Member

Looks like we forgot a compat check for https://github.com/moby/moby/actions/runs/8830465079/job/24245262993?pr=47683#step:12:2959

=== FAIL: frontend/dockerfile TestIntegration/TestCommandSourceMapping/worker=dockerd/frontend=builtin (5.31s)
    dockerfile_provenance_test.go:1183: 
        	Error Trace:	/src/frontend/dockerfile/dockerfile_provenance_test.go:1183
        	            				/src/util/testutil/integration/run.go:94
        	            				/src/util/testutil/integration/run.go:208
        	Error:      	Received unexpected error:
        	            	exporter "image" could not be found
        	            	github.com/moby/buildkit/util/stack.Enable
        	            		/src/util/stack/stack.go:77
        	            	github.com/moby/buildkit/util/grpcerrors.FromGRPC
        	            		/src/util/grpcerrors/grpcerrors.go:198
        	            	github.com/moby/buildkit/util/grpcerrors.UnaryClientInterceptor
        	            		/src/util/grpcerrors/intercept.go:41
        	            	google.golang.org/grpc.(*ClientConn).Invoke
        	            		/src/vendor/google.golang.org/grpc/call.go:35
        	            	github.com/moby/buildkit/api/services/control.(*controlClient).Solve
        	            		/src/api/services/control/control.pb.go:2234
        	            	github.com/moby/buildkit/client.(*Client).solve.func2
        	            		/src/client/solve.go:274
        	            	golang.org/x/sync/errgroup.(*Group).Go.func1
        	            		/src/vendor/golang.org/x/sync/errgroup/errgroup.go:75
        	            	runtime.goexit
        	            		/usr/local/go/src/runtime/asm_amd64.s:1650
        	            	failed to solve
        	            	github.com/moby/buildkit/client.(*Client).solve.func2
        	            		/src/client/solve.go:290
        	            	golang.org/x/sync/errgroup.(*Group).Go.func1
        	            		/src/vendor/golang.org/x/sync/errgroup/errgroup.go:75
        	            	runtime.goexit
        	            		/usr/local/go/src/runtime/asm_amd64.s:1650
        	Test:       	TestIntegration/TestCommandSourceMapping/worker=dockerd/frontend=builtin

- full diff: moby/buildkit@v0.13.1...4f2ebdd

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
eea0b41bf4fb1d69e109ff5ff8045c63f0c0d510 added a new argument to
`instructions.Parse` to support issuing linter warnings.

Classic builder uses it to parse the Dockerfile instructions and its
usage needs adjustment.

The classic builder is deprecated and we won't be adding any new
features to it, so we just pass a nil linter callback.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
1b1c5bc08ad81add007eb647e66ed0929693f3a0 extended the function signature
with one additional return value.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
@vvoland
Copy link
Contributor Author

vvoland commented May 13, 2024

Rebased with the latest master.

Looks like moby/buildkit@228e250 did some major refactoring of the detect which are breaking changes on our side:

builder/builder-next/controller.go:70:25: undefined: detect.Exporter
cmd/dockerd/daemon.go:248:20: undefined: detect.TracerProvider
cmd/dockerd/daemon.go:371:9: undefined: detect.Shutdown

@jsternberg PTAL

Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
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.

None yet

3 participants