[20.10] vendor: update containerd to latest of docker-20.10 branch #44067
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thaJeztah
added
area/builder
area/runtime
status/2-code-review
kind/bugfix
thaJeztah
commented
Aug 31, 2022
This brings the containerd vendoring up-to-date with the latest changes from the docker-20.10 branch in our fork (https://github.com/moby/containerd). This adds some fixes that were included in another fork that was used in the BuildKit repository, which have now been ported to our fork as well. Relevant changes: - docker: avoid concurrent map access panic - overlay: support "userxattr" option (kernel 5.11) (does not affect vendored code) full diff: moby/containerd@7cfa023...96c5ae0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
20.10_update_containerd_vendor
branch
from
a991b2b
to
9e7662e
Compare
AkihiroSuda
approved these changes
Sep 4, 2022
|
Let me bring this one in; this patch was reviewed in the maintainers meeting (but at the time used the PR branch) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backports:
This brings the containerd vendoring up-to-date with the latest changes from
the docker-20.10 branch in our fork (https://github.com/moby/containerd). This
adds some fixes that were included in another fork that was used in the BuildKit
repository, which have now been ported to our fork as well.
Relevant changes:
full diff: moby/containerd@7cfa023...96c5ae0
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)