Skip to content

Commit

Permalink
Show "seccomp" in docker info (#20909).
Browse files Browse the repository at this point in the history
This pull request added a `SecurityOptions` field in the `GET /info`
output to show if there is `apparmor`, `seccomp`, or `selinux` suport.

The API changes are updated in the documentation and the update in
`GET /info` is covered by the test case in `TestInfoApi`.

This pull request fixes #20909.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
  • Loading branch information
yongtang committed Mar 30, 2016
1 parent 2f35c6b commit 190654a
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 1 deletion.
12 changes: 12 additions & 0 deletions daemon/info.go
Expand Up @@ -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),
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docs/reference/api/docker_remote_api.md
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions docs/reference/api/docker_remote_api_v1.24.md
Expand Up @@ -2239,6 +2239,11 @@ Display system-wide information
"127.0.0.0/8"
]
},
"SecurityOptions": [
"apparmor",
"seccomp",
"selinux"
],
"ServerVersion": "1.9.0",
"SwapLimit": false,
"SystemStatus": [["State", "Healthy"]],
Expand Down
3 changes: 2 additions & 1 deletion integration-cli/docker_api_info_test.go
Expand Up @@ -31,7 +31,8 @@ func (s *DockerSuite) TestInfoApi(c *check.C) {
"MemTotal",
"KernelVersion",
"Driver",
"ServerVersion"}
"ServerVersion",
"SecurityOptions"}

out := string(body)
for _, linePrefix := range stringsToCheck {
Expand Down

0 comments on commit 190654a

Please sign in to comment.