Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26276 from runcom/seccomp-conf 

daemon: add a flag to override the default seccomp profile
This commit is contained in:
Justin Cormack 2016-11-04 15:45:30 +00:00 committed by GitHub
parent 38a582f54c 557db1ea68
commit 4758d72fa3
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
command/system/info.go
View File

@ -140,9 +140,20 @@ func prettyPrintInfo(dockerCli *command.DockerCli, info types.Info) error {
} }
if info.OSType == "linux" { if info.OSType == "linux" {
fmt.Fprintf(dockerCli.Out(), "Security Options:") if len(info.SecurityOptions) != 0 {
ioutils.FprintfIfNotEmpty(dockerCli.Out(), " %s", strings.Join(info.SecurityOptions, " ")) fmt.Fprintf(dockerCli.Out(), "Security Options:\n")
fmt.Fprintf(dockerCli.Out(), "\n") for _, o := range info.SecurityOptions {
switch o.Key {
case "Name":
fmt.Fprintf(dockerCli.Out(), " %s\n", o.Value)
case "Profile":
if o.Key != "default" {
fmt.Fprintf(dockerCli.Err(), " WARNING: You're not using the Docker's default seccomp profile\n")
}
fmt.Fprintf(dockerCli.Out(), " %s: %s\n", o.Key, o.Value)
}
}
}
} }
// Isolation only has meaning on a Windows daemon. // Isolation only has meaning on a Windows daemon.