Skip to content

Commit

Permalink
Merge pull request moby#27955 from mlaventure/runc-docker-info
Browse files Browse the repository at this point in the history
Add external binaries version to docker info
  • Loading branch information
vieux authored Nov 11, 2016
2 parents 795e487 + 801167f commit 19c8941
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions command/system/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,22 @@ func prettyPrintInfo(dockerCli *command.DockerCli, info types.Info) error {
}

if info.OSType == "linux" {
fmt.Fprintf(dockerCli.Out(), "Init Binary: %v\n", info.InitBinary)

for _, ci := range []struct {
Name string
Commit types.Commit
}{
{"containerd", info.ContainerdCommit},
{"runc", info.RuncCommit},
{"init", info.InitCommit},
} {
fmt.Fprintf(dockerCli.Out(), "%s version: %s", ci.Name, ci.Commit.ID)
if ci.Commit.ID != ci.Commit.Expected {
fmt.Fprintf(dockerCli.Out(), " (expected: %s)", ci.Commit.Expected)
}
fmt.Fprintf(dockerCli.Out(), "\n")
}
if len(info.SecurityOptions) != 0 {
fmt.Fprintf(dockerCli.Out(), "Security Options:\n")
for _, o := range info.SecurityOptions {
Expand Down

0 comments on commit 19c8941

Please sign in to comment.