Skip to content

vendor: github.com/containerd/containerd v1.7.20#48188

Merged
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:vendor_containerd_1.7.20
Jul 19, 2024
Merged

vendor: github.com/containerd/containerd v1.7.20#48188
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:vendor_containerd_1.7.20

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

full diff: containerd/containerd@v1.7.19...v1.7.20

- A picture of a cute animal (not mandatory but encouraged)

Comment on lines +958 to +962
if len(caps) == 0 {
s.Process.Capabilities.Inheritable = nil
} else if len(s.Process.Capabilities.Inheritable) > 0 {
filterCaps(&s.Process.Capabilities.Inheritable, caps)
}
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

FWIW; not (yet) back porting this bump to v27.1; I need to get my head around some of the changes here around capabilities (I know they were a bit of a footgun in the past, and I wanted to double check those changes).

@thaJeztah thaJeztah merged commit adbc4bc into moby:master Jul 19, 2024
@thaJeztah thaJeztah deleted the vendor_containerd_1.7.20 branch July 19, 2024 10:51
@thaJeztah
Copy link
Copy Markdown
Member Author

#48188 (comment)

FWIW; not (yet) back porting this bump to v27.1; I need to get my head around some of the changes here around capabilities (I know they were a bit of a footgun in the past, and I wanted to double check those changes).

I'll add cherry-pick labels though, so that we can include the bump in a patch release after we double-checked the changes (also to check if we need similar changes in the moby code)

@thaJeztah
Copy link
Copy Markdown
Member Author

Chatted with @dmcgowan, who gave some more context on the change, and it looks to be ok to include; opened a cherry-pick; #48196

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants