Skip to content

Commit

Permalink
Add security info to docker info
Browse files Browse the repository at this point in the history
The security infomation has already been added to `GET /info` in moby#21172.
However, it is not part of the output of `docker info` yet.

This fix adds the security information to `docker info`.

Additional tests has been added to cover changes.

This fix fixes moby#23500. This fix is related to moby#20909, moby#21172.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
  • Loading branch information
yongtang committed Jun 14, 2016
1 parent 6381ed1 commit eee20b5
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 0 deletions.
4 changes: 4 additions & 0 deletions api/client/info.go
Expand Up @@ -94,6 +94,10 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
fmt.Fprintf(cli.out, "Default Runtime: %s\n", info.DefaultRuntime)
}

fmt.Fprintf(cli.out, "Security Options:")
ioutils.FprintfIfNotEmpty(cli.out, " %s", strings.Join(info.SecurityOptions, " "))
fmt.Fprintf(cli.out, "\n")

ioutils.FprintfIfNotEmpty(cli.out, "Kernel Version: %s\n", info.KernelVersion)
ioutils.FprintfIfNotEmpty(cli.out, "Operating System: %s\n", info.OperatingSystem)
ioutils.FprintfIfNotEmpty(cli.out, "OSType: %s\n", info.OSType)
Expand Down
1 change: 1 addition & 0 deletions integration-cli/docker_cli_info_test.go
Expand Up @@ -32,6 +32,7 @@ func (s *DockerSuite) TestInfoEnsureSucceeds(c *check.C) {
"Storage Driver:",
"Volume:",
"Network:",
"Security Options:",
}

if DaemonIsLinux.Condition() {
Expand Down
15 changes: 15 additions & 0 deletions integration-cli/docker_cli_info_unix_test.go
@@ -0,0 +1,15 @@
// +build !windows

package main

import (
"github.com/docker/docker/pkg/integration/checker"
"github.com/go-check/check"
)

func (s *DockerSuite) TestInfoSecurityOptions(c *check.C) {
testRequires(c, SameHostDaemon, seccompEnabled, Apparmor, DaemonIsLinux)

out, _ := dockerCmd(c, "info")
c.Assert(out, checker.Contains, "Security Options: apparmor seccomp")
}

0 comments on commit eee20b5

Please sign in to comment.