Skip to content

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

Merged
tonistiigi merged 1 commit into
moby:v0.8from
AkihiroSuda:containerd-20210311-v0.8
Mar 15, 2021
Merged

[v0.8] vendor containerd (required for rootless overlayfs on kernel 5.11)#2014
tonistiigi merged 1 commit into
moby:v0.8from
AkihiroSuda:containerd-20210311-v0.8

Conversation

@AkihiroSuda

@AkihiroSuda AkihiroSuda commented Mar 11, 2021

Copy link
Copy Markdown
Member

@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
Copy Markdown
Member Author

Can we have v0.8.3 with this soon?

@tonistiigi

Copy link
Copy Markdown
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
Copy Markdown
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