Skip to content

Update fsutil to latest master and remove deprecated fileutil.Matches#42758

Closed
aaronlehmann wants to merge 1 commit intomoby:masterfrom
aaronlehmann:update-fsutil
Closed

Update fsutil to latest master and remove deprecated fileutil.Matches#42758
aaronlehmann wants to merge 1 commit intomoby:masterfrom
aaronlehmann:update-fsutil

Conversation

@aaronlehmann
Copy link
Copy Markdown

@aaronlehmann aaronlehmann commented Aug 18, 2021 •
edited by thaJeztah
Loading

fixes #42788

Now that fsutil is being updated to a new version, the original Matches
function and method are no longer needed. Remove them in favor of the
versions that have been fixed to handle **/foo patterns.

See #42676 for context.

@aaronlehmann aaronlehmann requested a review from tianon as a code owner August 18, 2021 20:10
@aaronlehmann
Copy link
Copy Markdown
Author

aaronlehmann commented Aug 18, 2021

This will need an update to buildkit too; I'll open a PR over there.

@aaronlehmann
Copy link
Copy Markdown
Author

aaronlehmann commented Aug 18, 2021

Buildkit PR here: moby/buildkit#2319

Once it gets merged, I can update this PR to revendor buildkit as well.

@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented Aug 18, 2021

Ah, yes, looks like it's currently failing;


[2021-08-18T20:24:33.242Z] Building test suite binary /go/src/github.com/docker/docker/integration/container/test.main
[2021-08-18T20:25:29.555Z] # github.com/docker/docker/vendor/github.com/moby/buildkit/cache/contenthash
[2021-08-18T20:25:29.555Z] vendor/github.com/moby/buildkit/cache/contenthash/checksum.go:621:34: includePatternMatcher.Matches undefined (type *fileutils.PatternMatcher has no field or method Matches)
[2021-08-18T20:25:29.555Z] vendor/github.com/moby/buildkit/cache/contenthash/checksum.go:631:34: excludePatternMatcher.Matches undefined (type *fileutils.PatternMatcher has no field or method Matches)
[2021-08-18T20:25:29.555Z] # github.com/docker/docker/vendor/github.com/moby/buildkit/cache/contenthash
[2021-08-18T20:25:29.555Z] vendor/github.com/moby/buildkit/cache/contenthash/checksum.go:621:34: includePatternMatcher.Matches undefined (type *fileutils.PatternMatcher has no field or method Matches)
[2021-08-18T20:25:29.555Z] vendor/github.com/moby/buildkit/cache/contenthash/checksum.go:631:34: excludePatternMatcher.Matches undefined (type *fileutils.PatternMatcher has no field or method Matches)

Let me warn up-front that updating buildkit may involve some niggles; I was working on that for the docker/cli (and did it in a couple of steps to bring other dependencies up to date); docker/cli#3237.

If I'm able to find some time, I may give it a try to update it (if it can work without this update), then leave the final update to this PR.

@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented Aug 18, 2021

The circular dependency is a bit of a pain; I recall doing tonistiigi/fsutil#105 to move this all to fsutil, but I think Tonis didn't want to have to maintain it 😂

Update fsutil to latest master and remove deprecated fileutil.Matches
178765d 
Now that fsutil is being updated to a new version, the original Matches
function and method are no longer needed. Remove them in favor of the
versions that have been fixed to handle **/foo patterns.

Signed-off-by: Aaron Lehmann <alehmann@netflix.com>
@aaronlehmann
Copy link
Copy Markdown
Author

aaronlehmann commented Aug 24, 2021

@thaJeztah: The buildkit PR got merged. I tried updating buildkit and I've run into some issues with other dependencies. Would you be interested in taking it from here?

@thaJeztah thaJeztah mentioned this pull request Aug 26, 2021
Open
@aaronlehmann
Copy link
Copy Markdown
Author

aaronlehmann commented Sep 21, 2021

I won't be completing this; therefore closing the PR.

@aaronlehmann aaronlehmann mentioned this pull request Sep 22, 2021
Open
@crazy-max crazy-max mentioned this pull request Oct 25, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tonistiigi tonistiigi Awaiting requested review from tonistiigi

@thaJeztah thaJeztah Awaiting requested review from thaJeztah

@tianon tianon Awaiting requested review from tianon tianon is a code owner

Assignees

No one assigned

Labels

area/builder Build status/needs-vendoring status/2-code-review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

.dockerignore: !**/file doesn't work for selected inclusion

2 participants

@aaronlehmann @thaJeztah