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 containerd (requred for rootless overlayfs on kernel 5.11) #2013

Merged
merged 1 commit into from
Mar 11, 2021

Conversation

AkihiroSuda
Copy link
Member

Required for rootless overlayfs on kernel 5.11
containerd/containerd#5076

Required for rootless overlayfs on kernel 5.11
containerd/containerd#5076

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@tonistiigi tonistiigi merged commit 2be2384 into moby:master Mar 11, 2021
@tonistiigi
Copy link
Member

I'm not sure if we can cherry-pick so big commit. You might need to make a special branch if you need a specific commit.

@tonistiigi
Copy link
Member

Can you also take a look at #2001 . We can also start testing 1.5-beta and drop 1.3. Although I'd like to understand what causes the problem in #2001 (think it is related to how tests use the shims).

AkihiroSuda added a commit to AkihiroSuda/buildkit_poc that referenced this pull request Mar 11, 2021
Vendor https://github.com/AkihiroSuda/containerd/commits/buildkit/v0.8/20210311 .

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

Relates to moby#2013

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda
Copy link
Member Author

I'm not sure if we can cherry-pick so big commit. You might need to make a special branch if you need a specific commit.

#2014

Can you also take a look at #2001 . We can also start testing 1.5-beta and drop 1.3. Although I'd like to understand what causes the problem in #2001 (think it is related to how tests use the shims).

Yes, I'm looking into this, but still no success.

AkihiroSuda added a commit to AkihiroSuda/buildkit_poc that referenced this pull request Mar 12, 2021
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 <akihiro.suda.cz@hco.ntt.co.jp>
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