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

Merge pull request #5422 from thaJeztah/info_no_expected_version 

info: stop printing "Expected" commits
This commit is contained in:
Sebastiaan van Stijn 2024-09-10 19:43:51 +02:00 committed by GitHub
parent a464a63d33 88ca4e958f
commit 6965f40090
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cli/command/system/info.go
View File

@ -273,21 +273,9 @@ func prettyPrintServerInfo(streams command.Streams, info *dockerInfo) []error {
if info.OSType == "linux" { if info.OSType == "linux" {
fprintln(output, " Init Binary:", info.InitBinary) fprintln(output, " Init Binary:", info.InitBinary)
fprintln(output, " containerd version:", info.ContainerdCommit.ID)
for _, ci := range []struct { fprintln(output, " runc version:", info.RuncCommit.ID)
Name string fprintln(output, " init version:", info.InitCommit.ID)
Commit system.Commit
}{
{"containerd", info.ContainerdCommit},
{"runc", info.RuncCommit},
{"init", info.InitCommit},
} {
fprintf(output, " %s version: %s", ci.Name, ci.Commit.ID)
if ci.Commit.ID != ci.Commit.Expected {
fprintf(output, " (expected: %s)", ci.Commit.Expected)
}
fprintln(output)
}
if len(info.SecurityOptions) != 0 { if len(info.SecurityOptions) != 0 {
if kvs, err := system.DecodeSecurityOptions(info.SecurityOptions); err != nil { if kvs, err := system.DecodeSecurityOptions(info.SecurityOptions); err != nil {
errs = append(errs, err) errs = append(errs, err)