diff options
| author | Vincent Demeester <vincent@sbr.pm> | 2016-04-15 01:24:54 +0200 |
|---|---|---|
| committer | Vincent Demeester <vincent@sbr.pm> | 2016-04-15 01:24:54 +0200 |
| commit | bc0c8828e9afc32f1660a1f679ed523376c7d3d2 (patch) | |
| tree | 24481f53ace84e6f1ddcb01b2dc960539982b3fa | |
| parent | 8011228b53ead375cf7645bf4e7f686324e6e9d6 (diff) | |
| parent | 190654aa2ee880c2052c0887a215b85d24049f6d (diff) | |
| download | docker-bc0c8828e9afc32f1660a1f679ed523376c7d3d2.tar.gz | |
Merge pull request #21172 from yongtang/20909-seccomp-in-docker-info
Show "seccomp" in docker info (#20909).
| -rw-r--r-- | daemon/info.go | 12 | ||||
| -rw-r--r-- | docs/reference/api/docker_remote_api.md | 1 | ||||
| -rw-r--r-- | docs/reference/api/docker_remote_api_v1.24.md | 5 | ||||
| -rw-r--r-- | integration-cli/docker_api_info_test.go | 3 |
4 files changed, 20 insertions, 1 deletions
diff --git a/daemon/info.go b/daemon/info.go index 062b96493d..9ef74d2132 100644 --- a/daemon/info.go +++ b/daemon/info.go @@ -67,6 +67,17 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) { } }) + var securityOptions []string + if sysInfo.AppArmor { + securityOptions = append(securityOptions, "apparmor") + } + if sysInfo.Seccomp { + securityOptions = append(securityOptions, "seccomp") + } + if selinuxEnabled() { + securityOptions = append(securityOptions, "selinux") + } + v := &types.Info{ ID: daemon.ID, Containers: int(cRunning + cPaused + cStopped), @@ -104,6 +115,7 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) { HTTPProxy: sockets.GetProxyEnv("http_proxy"), HTTPSProxy: sockets.GetProxyEnv("https_proxy"), NoProxy: sockets.GetProxyEnv("no_proxy"), + SecurityOptions: securityOptions, } // TODO Windows. Refactor this more once sysinfo is refactored into diff --git a/docs/reference/api/docker_remote_api.md b/docs/reference/api/docker_remote_api.md index 26c094118b..cc61e080b1 100644 --- a/docs/reference/api/docker_remote_api.md +++ b/docs/reference/api/docker_remote_api.md @@ -117,6 +117,7 @@ This section lists each version from latest to oldest. Each listing includes a [Docker Remote API v1.24](docker_remote_api_v1.24.md) documentation * `POST /containers/create` now takes `StorageOpt` field. +* `GET /info` now returns `SecurityOptions` field, showing if `apparmor`, `seccomp`, or `selinux` is supported. ### v1.23 API changes diff --git a/docs/reference/api/docker_remote_api_v1.24.md b/docs/reference/api/docker_remote_api_v1.24.md index 1ae41d01fb..679140f243 100644 --- a/docs/reference/api/docker_remote_api_v1.24.md +++ b/docs/reference/api/docker_remote_api_v1.24.md @@ -2240,6 +2240,11 @@ Display system-wide information "127.0.0.0/8" ] }, + "SecurityOptions": [ + "apparmor", + "seccomp", + "selinux" + ], "ServerVersion": "1.9.0", "SwapLimit": false, "SystemStatus": [["State", "Healthy"]], diff --git a/integration-cli/docker_api_info_test.go b/integration-cli/docker_api_info_test.go index 9e6af66e5a..f80b8a198c 100644 --- a/integration-cli/docker_api_info_test.go +++ b/integration-cli/docker_api_info_test.go @@ -31,7 +31,8 @@ func (s *DockerSuite) TestInfoApi(c *check.C) { "MemTotal", "KernelVersion", "Driver", - "ServerVersion"} + "ServerVersion", + "SecurityOptions"} out := string(body) for _, linePrefix := range stringsToCheck { |