-
Notifications
You must be signed in to change notification settings - Fork 147
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
Switch to github.com/moby/sys/capability #777
base: master
Are you sure you want to change the base?
Conversation
@kolyshkin looks like you need to fix vendoring;
|
@kolyshkin gentle nudge 😄 |
@thaJeztah @cyphar sorry for the delay; this is now ready |
The github.com/moby/sys/capability package is a fork of the original one, which is apparently no longer maintained. For changes since the fork took place, see https://github.com/moby/sys/blob/main/capability/CHANGELOG.md (The indirect dependency still remains because of runtime-tools; this is being fixed in opencontainers/runtime-tools#777). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
No strong opinions; I know Moby has dropped support for RHEL6 a long time ago, and I'm not sure if anyone would still be depending on this (I highly doubt other runtimes would still take RHEL6 into account). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@kolyshkin this needs another rebase 🙈 |
The github.com/moby/sys/capability package is a fork of the original one, which is apparently no longer maintained. For changes since the fork took place, see https://github.com/moby/sys/blob/main/capability/CHANGELOG.md (The indirect dependency still remains because of runtime-tools; this is being fixed in opencontainers/runtime-tools#777). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
The github.com/moby/sys/capability package is a fork of the original one, which apparently is no longer maintained. Also, bump Go to 1.21 as this is a minimally supported version for github.com/moby/sys/capability, and update CI accordingly. Note that "workaround for RHEL6" is removed for a number of reasons. Feel free to choose the one you like the most, either is sufficient: 1. /proc/sys/kernel/cap_last_cap is available since RHEL 6.7 (kernel 2.6.32-573.el6), released 9 years ago (2015-07-22). 2. It incorrectly returns CAP_BLOCK_SUSPEND (36), which was only added in kernel v3.5 and was never backported to RHEL6 kernels. The correct value for RHEL6 would be CAP_MAC_ADMIN (33). 3. As far as upstream kernels go, /proc/sys/kernel/cap_last_cap was added in kernel v3.2, and a correct value depends on the kernel version. It could be CAP_WAKE_ALARM (35), added to kernel v3.0, or CAP_SYSLOG (34), added to kernel v2.6.38, or possibly a lesser value for even older kernels. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Rebased |
I just did a detailed writeup on this because removing a hack always looks suspicious and raises some questions (and so I'm answering those in advance). I'm 100% sure this is no longer needed (even for RHEL6). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
LGTM |
The github.com/moby/sys/capability package is a fork of the original one, which is apparently no longer maintained. For changes since the fork took place, see https://github.com/moby/sys/blob/main/capability/CHANGELOG.md (The indirect dependency still remains because of runtime-tools; this is being fixed in opencontainers/runtime-tools#777). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> GPG signed by Alexander Mikhalitsyn Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
The github.com/moby/sys/capability package is a fork of the original one, which is apparently no longer maintained. For changes since the fork took place, see https://github.com/moby/sys/blob/main/capability/CHANGELOG.md (The indirect dependency still remains because of runtime-tools; this is being fixed in opencontainers/runtime-tools#777). Related to: moby/sys#183
Currently a draft pending #776 merge.The github.com/moby/sys/capability package is a fork of the original
one, which is apparently no longer maintained.
For changes since the fork took place, see
https://github.com/moby/sys/blob/main/capability/CHANGELOG.md
Related to: moby/sys#183
Also, bump Go to 1.21 as this is a minimally supported version for
github.com/moby/sys/capability, and update CI accordingly.
Note that "workaround for RHEL6" is removed for a number of reasons.
Feel free to choose the one you like the most, either is sufficient:
/proc/sys/kernel/cap_last_cap is available since RHEL 6.7
(kernel 2.6.32-573.el6), released 9 years ago (2015-07-22).
It incorrectly returns CAP_BLOCK_SUSPEND (36), which was only added
in kernel v3.5 and was never backported to RHEL6 kernels. The
correct value for RHEL6 would be CAP_MAC_ADMIN (33).
As far as upstream kernels go, /proc/sys/kernel/cap_last_cap was
added in kernel v3.2, and a correct value depends on the kernel
version. It could be CAP_WAKE_ALARM (35), added to kernel v3.0, or
CAP_SYSLOG (34), added to kernel v2.6.38, or possibly a lesser value
for even older kernels.