Fix seccomp output in docker info

This fix tries to address the issue raised in #24374 where
`docker info` outputs seccomp support in Ubuntu 14.04 but
the seccomp wass not actually supported.

The issue is that in the current docker implementation, seccomp
support is only checked against the kernel by inspect CONFIG_SECCOMP
and CONFIG_SECCOMP_FILTER. However, seccomp might not be enabled
when building docker (through golang build flag).

This fix adds a supportSeccomp boolean variable. The supportSeccomp
is only set to true when seccomp is enabled when building docker.

This fix fixes #24374.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit a3b9dd89a1)
Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Yong Tang 2016-07-08 15:54:48 -07:00 committed by Tibor Vass
parent b008283a7f
commit adbb169463
4 changed files with 11 additions and 2 deletions

View file

@ -71,7 +71,7 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
if sysInfo.AppArmor {
securityOptions = append(securityOptions, "apparmor")
}
if sysInfo.Seccomp {
if sysInfo.Seccomp && supportsSeccomp {
securityOptions = append(securityOptions, "seccomp")
}
if selinuxEnabled() {

View file

@ -1,4 +1,4 @@
// +build !seccomp,!windows
// +build linux,!seccomp
package daemon
@ -9,6 +9,8 @@ import (
"github.com/opencontainers/specs/specs-go"
)
var supportsSeccomp = false
func setSeccomp(daemon *Daemon, rs *specs.Spec, c *container.Container) error {
if c.SeccompProfile != "" && c.SeccompProfile != "unconfined" {
return fmt.Errorf("seccomp profiles are not supported on this daemon, you cannot specify a custom seccomp profile")

View file

@ -11,6 +11,8 @@ import (
"github.com/opencontainers/specs/specs-go"
)
var supportsSeccomp = true
func setSeccomp(daemon *Daemon, rs *specs.Spec, c *container.Container) error {
var profile *specs.Seccomp
var err error

View file

@ -0,0 +1,5 @@
// +build !linux
package daemon
var supportsSeccomp = false