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

[v0.8] vendor containerd (required for rootless overlayfs on kernel 5.11) #2014

Merged
merged 1 commit into from
Mar 15, 2021

Conversation

AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented Mar 11, 2021

Vendor https://github.com/AkihiroSuda/containerd/commits/buildkit/v0.8/20210312 .

This revision is forked from containerd/containerd@0edc412 (20201117) with overlay: support "userxattr" option (kernel 5.11) (containerd/containerd#5076)

Relates to #2013

@AkihiroSuda AkihiroSuda changed the title vendor containerd (required for rootless overlayfs on kernel 5.11) [v0.8] vendor containerd (required for rootless overlayfs on kernel 5.11) Mar 11, 2021
@AkihiroSuda
Copy link
Member Author

Can we have v0.8.3 with this soon?

@tonistiigi
Copy link
Member

@AkihiroSuda could you pick containerd/containerd#4855 as well. for #1983

Vendor https://github.com/AkihiroSuda/containerd/commits/buildkit/v0.8/20210312 .

Forked from containerd/containerd@0edc412 (20201117) with:
- `Adjust overlay tests to expect "index=off"`        (containerd PR 4719)
   (for ease of cherry-picking containerd PR 5076)
- `overlay: support "userxattr" option (kernel 5.11)` (containerd PR 5076)
- `docker: avoid concurrent map access panic`         (containerd PR 4855)

Relates to moby#2013

Signed-off-by: Akihiro Suda <[email protected]>
@AkihiroSuda AkihiroSuda force-pushed the containerd-20210311-v0.8 branch from 8d7110d to 2617f12 Compare March 12, 2021 04:47
@AkihiroSuda
Copy link
Member Author

@tonistiigi done

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/rootless rootless mode
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants