[v0.8] update containerd to latest of docker-20.10 branch #3076
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
This comment was marked as resolved.
This comment was marked as resolved.
thaJeztah
force-pushed
the
0.8_update_containerd
branch
from
f4d83d3
to
7971d11
Compare
This comment was marked as resolved.
This comment was marked as resolved.
thaJeztah
force-pushed
the
0.8_update_containerd
branch
from
7971d11
to
5525467
Compare
This comment was marked as resolved.
This comment was marked as resolved.
thaJeztah
force-pushed
the
0.8_update_containerd
branch
from
5525467
to
837491d
Compare
|
Looks to be resolved now (finally!), but no clue what caused it. Perhaps build-cache or go cache in combination with CGO? |
This comment was marked as resolved.
This comment was marked as resolved.
thaJeztah
force-pushed
the
0.8_update_containerd
branch
from
837491d
to
f3102c8
Compare
|
Rebased on top of #3079 |
thaJeztah
force-pushed
the
0.8_update_containerd
branch
from
f3102c8
to
f5003aa
Compare
crazy-max
approved these changes
Sep 7, 2022
AkihiroSuda
reviewed
Sep 7, 2022
| @@ -76,7 +75,7 @@ replace ( | |||
| // - `Adjust overlay tests to expect "index=off"` (#4719, for ease of cherry-picking #5076) | |||
| // - `overlay: support "userxattr" option (kernel 5.11)` (#5076) | |||
| // - `docker: avoid concurrent map access panic` (#4855) | |||
There was a problem hiding this comment.
Could you update these comment lines
This brings the containerd vendoring up-to-date with the latest changes from the docker-20.10 branch in our fork. This fork has fixes that were previously included in Akihiro's fork, and some security fixes that were included in moby patch releases; - Fix Inheritable capability defaults (CVE-2022-24769) - images: validate document type before unmarshal (CVE-2021-41190) - schema1: reject ambiguous documents (CVE-2021-41190) Patches included in the fork; moby/containerd@0edc412...96c5ae0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
0.8_update_containerd
branch
from
f5003aa
to
215f064
Compare
AkihiroSuda
approved these changes
Sep 8, 2022
thaJeztah
changed the title
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.
This brings the containerd vendoring up-to-date with the latest changes from
the docker-20.10 branch in our fork. This fork has fixes that were previously
included in Akihiro's fork, and some security fixes that were included in moby
patch releases;
Patches included in the fork;
moby/containerd@0edc412...96c5ae0
Signed-off-by: Sebastiaan van Stijn github@gone.nl