[release/1.7] update to CDI v0.6.1, and remove github.com/opencontainers/runc dependency#9605
Merged
fuweid merged 5 commits intocontainerd:release/1.7from Jan 8, 2024
Conversation
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 5e054ee) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
cncf-tags/container-device-interface@v0.5.4...v0.6.0 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 0498ace) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
opencontainers/runtime-spec@v1.1.0-rc.2...v1.1.0 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 235a445) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Removes uses of the github.com/opencontainers/runc/libcontainer/devices package. full diff: cncf-tags/container-device-interface@v0.6.0...v0.6.1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 05093d7) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This migrates uses of github.com/opencontainers/runc/libcontainer/user to the new github.com/moby/sys/user module, which was extracted from runc at commit [opencontainers/runc@a3a0ec4]. This is the initial release of the module, which is a straight copy, but some changes may be made in the next release (such as fixing camel-casing in some fields and functions (Uid -> UID). [opencontainers/runc@a3a0ec4]: opencontainers/runc@a3a0ec4 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 4b1bb12) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
AkihiroSuda
approved these changes
Jan 5, 2024
This file contains hidden or 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
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.
(partial) backports of:
I skipped intermediate runc updates, as it would be removed, so there was no need to include those.