diff --git a/docs/containers.conf.5.md b/docs/containers.conf.5.md index a2eb62f09..6df649e62 100644 --- a/docs/containers.conf.5.md +++ b/docs/containers.conf.5.md @@ -88,22 +88,24 @@ List of default capabilities for containers. The default list is: ``` default_capabilities = [ -"AUDIT_WRITE", "CHOWN", "DAC_OVERRIDE", "FOWNER", "FSETID", "KILL", - "MKNOD", "NET_BIND_SERVICE", - "NET_RAW", + "SETFCAP", "SETGID", "SETPCAP", "SETUID", - "SYS_CHROOT", ] ``` +Note, by default container engines using containers.conf, run with less +capabilities than Docker. Docker runs additionally with "AUDIT_WRITE", "MKNOD", +"NET_RAW", "CHROOT". If you need to add one of these capabilities for a +particular container, you can use the --cap-add option or edit your system's containers.conf. + **default_sysctls**=[] A list of sysctls to be set in containers by default, diff --git a/pkg/config/containers.conf b/pkg/config/containers.conf index a101a9fcf..235092299 100644 --- a/pkg/config/containers.conf +++ b/pkg/config/containers.conf @@ -52,19 +52,18 @@ # List of default capabilities for containers. If it is empty or commented out, # the default capabilities defined in the container engine will be added. # -default_capabilities = [ - "CHOWN", - "DAC_OVERRIDE", - "FOWNER", - "FSETID", - "KILL", - "NET_BIND_SERVICE", - "SETFCAP", - "SETGID", - "SETPCAP", - "SETUID", - "SYS_CHROOT" -] +#default_capabilities = [ +# "CHOWN", +# "DAC_OVERRIDE", +# "FOWNER", +# "FSETID", +# "KILL", +# "NET_BIND_SERVICE", +# "SETFCAP", +# "SETGID", +# "SETPCAP", +# "SETUID", +#] # A list of sysctls to be set in containers by default, # specified as "name=value", diff --git a/pkg/config/default.go b/pkg/config/default.go index e66437b34..4156d4371 100644 --- a/pkg/config/default.go +++ b/pkg/config/default.go @@ -76,20 +76,16 @@ var ( DefaultHooksDirs = []string{"/usr/share/containers/oci/hooks.d"} // DefaultCapabilities is the default for the default_capabilities option in the containers.conf file. DefaultCapabilities = []string{ - "CAP_AUDIT_WRITE", "CAP_CHOWN", "CAP_DAC_OVERRIDE", "CAP_FOWNER", "CAP_FSETID", "CAP_KILL", - "CAP_MKNOD", "CAP_NET_BIND_SERVICE", - "CAP_NET_RAW", "CAP_SETFCAP", "CAP_SETGID", "CAP_SETPCAP", "CAP_SETUID", - "CAP_SYS_CHROOT", } // Search these locations in which CNIPlugins can be installed.