Skip to content

[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
thaJeztah:1.7_backport_switch_moby_user
Jan 8, 2024
Merged

[release/1.7] update to CDI v0.6.1, and remove github.com/opencontainers/runc dependency#9605
fuweid merged 5 commits intocontainerd:release/1.7from
thaJeztah:1.7_backport_switch_moby_user

Conversation

@thaJeztah
Copy link
Member

AkihiroSuda and others added 5 commits January 5, 2024 14:15
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>
@thaJeztah thaJeztah requested review from AkihiroSuda and kzys January 5, 2024 13:25
@thaJeztah thaJeztah self-assigned this Jan 5, 2024
Copy link
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

@fuweid fuweid merged commit ccca466 into containerd:release/1.7 Jan 8, 2024
@thaJeztah thaJeztah deleted the 1.7_backport_switch_moby_user branch January 8, 2024 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants