Skip to content

vendor: github.com/tonistiigi/fsutil#44227

Closed
thaJeztah wants to merge 1 commit intomoby:masterfrom
thaJeztah:update_fsutil
Closed

vendor: github.com/tonistiigi/fsutil#44227
thaJeztah wants to merge 1 commit intomoby:masterfrom
thaJeztah:update_fsutil

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Sep 30, 2022 •
edited
Loading

@thaJeztah
Copy link
Member Author

thaJeztah commented Sep 30, 2022 •
edited
Loading

okay; looks like the BuildKit version we use is not yet compatible with the latest tonistiigi/fsutil

vendor/github.com/moby/buildkit/session/filesync/filesync.go:112:20: cannot use dir.Map (variable of type func(string, *types.Stat) bool) as type fsutil.MapFunc in struct literal

Breaking change was introduced in tonistiigi/fsutil@5a3ace4 (tonistiigi/fsutil#130), related to moby/buildkit#2837 / moby/buildkit#2856

@thaJeztah thaJeztah mentioned this pull request Sep 30, 2022
Merged
@thaJeztah thaJeztah mentioned this pull request Oct 3, 2022
Closed
@thaJeztah thaJeztah force-pushed the update_fsutil branch 3 times, most recently from 25c764b to a348454 Compare October 3, 2022 14:59
@thaJeztah thaJeztah mentioned this pull request Oct 4, 2022
Closed
thaJeztah
thaJeztah commented Oct 4, 2022
View reviewed changes
builder/builder-next/worker/worker.go Outdated
Comment on lines +161 to +165
// BuildkitVersion returns BuildKit version
func (w *Worker) BuildkitVersion() client.BuildkitVersion {
return w.Opt.BuildkitVersion
}

Copy link
Member Author

@thaJeztah thaJeztah Oct 4, 2022

Choose a reason for hiding this comment

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

@thaJeztah
Copy link
Member Author

thaJeztah commented Oct 4, 2022

Hmm... dang; this doesn't work it looks like 🤔 ;

#40 44.74 vendor/github.com/moby/buildkit/client/workers.go:20:18: undefined: BuildkitVersion
#40 44.74 vendor/github.com/moby/buildkit/client/workers.go:44:21: undefined: fromAPIBuildkitVersion

@thaJeztah
Copy link
Member Author

thaJeztah commented Oct 4, 2022

Nevermind 🤦 didn't stage a new file that was vendored

@thaJeztah thaJeztah force-pushed the update_fsutil branch 2 times, most recently from e14ed8d to 7126ad6 Compare October 4, 2022 12:27
@thaJeztah
Copy link
Member Author

thaJeztah commented Oct 4, 2022

This one is still failing; perhaps missing a skip ?

=== CONT  TestIntegration/TestNamedImageContextPlatform/worker=dockerd/frontend=client
2022/10/04 12:47:46 http2: server connection error from localhost: connection error: PROTOCOL_ERROR
    dockerfile_test.go:5480: 
        	Error Trace:	dockerfile_test.go:5480
        	            				run.go:87
        	            				run.go:201

@thaJeztah
Copy link
Member Author

thaJeztah commented Oct 4, 2022

Or the Version changes cause the error 🤔 (PROTOCOL_ERROR)

@thaJeztah
Copy link
Member Author

thaJeztah commented Oct 4, 2022

Okay, different error now, but still failing (so probably we're still missing a "skip" in BuildKit);

=== CONT  TestIntegration/TestNamedImageContextPlatform/worker=dockerd/frontend=builtin
    dockerfile_test.go:5480: 
        	Error Trace:	dockerfile_test.go:5480
        	            				run.go:87
        	            				run.go:201
        	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:188
        	            	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:1443
        	            	github.com/moby/buildkit/client.(*Client).solve.func2
        	            		/src/client/solve.go:209
        	            	golang.org/x/sync/errgroup.(*Group).Go.func1
        	            		/src/vendor/golang.org/x/sync/errgroup/errgroup.go:57
        	            	runtime.goexit
        	            		/usr/local/go/src/runtime/asm_amd64.s:1594
        	            	failed to solve
        	            	github.com/moby/buildkit/client.(*Client).solve.func2
        	            		/src/client/solve.go:222
        	            	golang.org/x/sync/errgroup.(*Group).Go.func1
        	            		/src/vendor/golang.org/x/sync/errgroup/errgroup.go:57
        	            	runtime.goexit
        	            		/usr/local/go/src/runtime/asm_amd64.s:1594
        	Test:       	TestIntegration/TestNamedImageContextPlatform/worker=dockerd/frontend=builtin
    sandbox.go:234: stdout: /usr/bin/dockerd
    sandbox.go:234: stderr: /usr/bin/dockerd
    sandbox.go:237: > startCmd 2022-10-04 14:04:46.779800658 +0000 UTC m=+106.006244030 [/usr/bin/dockerd --data-root /tmp/integration3653410606/dwm18pdoda08r/root --exec-root /tmp/dxr/dwm18pdoda08r --pidfile /tmp/integration3653410606/dwm18pdoda08r/docker.pid --host unix:///tmp/integration3653410606/dwm18pdoda08r/docker.sock --userland-proxy=false --containerd-namespace dwm18pdoda08r --containerd-plugins-namespace dwm18pdoda08rp --bip 10.66.66.1/24 --default-address-pool base=10.66.66.0/16,size=24 --debug]

@crazy-max
Copy link
Member

crazy-max commented Oct 13, 2022

Okay, different error now, but still failing (so probably we're still missing a "skip" in BuildKit);

Will be fixed by moby/buildkit#3176

@thaJeztah
vendor: github.com/tonistiigi/fsutil v0.0.0-20220930225714-4638ad635be5
49b42ff 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah closed this Apr 25, 2023
@thaJeztah thaJeztah deleted the update_fsutil branch April 25, 2023 10:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@thaJeztah @crazy-max