mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #42011 from thaJeztah/remove_capabilities_hack
Revert "Temporarily disable CAP_PERFMON, CAP_BPF, and CAP_CHECKPOINT_RESTORE
This commit is contained in:
commit
e6a3313f16
1 changed files with 0 additions and 12 deletions
|
@ -16,18 +16,6 @@ func init() {
|
||||||
if last == capability.Cap(63) {
|
if last == capability.Cap(63) {
|
||||||
last = capability.CAP_BLOCK_SUSPEND
|
last = capability.CAP_BLOCK_SUSPEND
|
||||||
}
|
}
|
||||||
if last > capability.CAP_AUDIT_READ {
|
|
||||||
// Prevents docker from setting CAP_PERFMON, CAP_BPF, and CAP_CHECKPOINT_RESTORE
|
|
||||||
// capabilities on privileged (or CAP_ALL) containers on Kernel 5.8 and up.
|
|
||||||
// While these kernels support these capabilities, the current release of
|
|
||||||
// runc ships with an older version of /gocapability/capability, and does
|
|
||||||
// not know about them, causing an error to be produced.
|
|
||||||
//
|
|
||||||
// FIXME remove once https://github.com/opencontainers/runc/commit/6dfbe9b80707b1ca188255e8def15263348e0f9a
|
|
||||||
// is included in a runc release and once we stop supporting containerd 1.3.x
|
|
||||||
// (which ships with runc v1.0.0-rc92)
|
|
||||||
last = capability.CAP_AUDIT_READ
|
|
||||||
}
|
|
||||||
for _, cap := range capability.List() {
|
for _, cap := range capability.List() {
|
||||||
if cap > last {
|
if cap > last {
|
||||||
continue
|
continue
|
||||||
|
|
Loading…
Add table
Reference in a new issue