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] update containerd to latest of docker-20.10 branch #3076

Merged
merged 1 commit into from
Sep 8, 2022

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Sep 2, 2022

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

@thaJeztah

This comment was marked as resolved.

@crazy-max

This comment was marked as resolved.

@thaJeztah

This comment was marked as resolved.

@thaJeztah
Copy link
Member Author

Looks to be resolved now (finally!), but no clue what caused it. Perhaps build-cache or go cache in combination with CGO?

@thaJeztah

This comment was marked as resolved.

@thaJeztah thaJeztah marked this pull request as draft September 4, 2022 19:36
@thaJeztah
Copy link
Member Author

Rebased on top of #3079

@thaJeztah thaJeztah marked this pull request as ready for review September 7, 2022 19:25
@@ -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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you update these comment lines

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AkihiroSuda updated 👍

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>
@crazy-max crazy-max merged commit 2274f61 into moby:v0.8 Sep 8, 2022
@thaJeztah thaJeztah deleted the 0.8_update_containerd branch September 8, 2022 11:42
@thaJeztah thaJeztah changed the title [0.8] update containerd to latest of docker-20.10 branch [v0.8] update containerd to latest of docker-20.10 branch Sep 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants