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

Merge pull request #3645 from thaJeztah/update_engine 

info: update plugin section to show installed path
This commit is contained in:
Sebastiaan van Stijn 2022-06-01 16:24:01 +02:00 committed by GitHub
parent 822b62073d b9e2659a05
commit d86fce7b05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,11 +180,9 @@ func prettyPrintClientInfo(dockerCli command.Cli, info clientInfo) {
fmt.Fprintln(dockerCli.Out(), " Plugins:") fmt.Fprintln(dockerCli.Out(), " Plugins:")
for _, p := range info.Plugins { for _, p := range info.Plugins {
if p.Err == nil { if p.Err == nil {
var version string fmt.Fprintf(dockerCli.Out(), " %s: %s (%s)\n", p.Name, p.ShortDescription, p.Vendor)
if p.Version != "" { fprintlnNonEmpty(dockerCli.Out(), " Version: ", p.Version)
version = ", " + p.Version fprintlnNonEmpty(dockerCli.Out(), " Path: ", p.Path)
}
fmt.Fprintf(dockerCli.Out(), " %s: %s (%s%s)\n", p.Name, p.ShortDescription, p.Vendor, version)
} else { } else {
info.Warnings = append(info.Warnings, fmt.Sprintf("WARNING: Plugin %q is not valid: %s", p.Path, p.Err)) info.Warnings = append(info.Warnings, fmt.Sprintf("WARNING: Plugin %q is not valid: %s", p.Path, p.Err))
} }

5
cli/command/system/testdata/docker-info-plugins.golden vendored
View File

@ -2,8 +2,11 @@ Client:
Context: default Context: default
Debug Mode: false Debug Mode: false
Plugins: Plugins:
goodplugin: unit test is good (ACME Corp, 0.1.0) goodplugin: unit test is good (ACME Corp)
Version: 0.1.0
Path: /path/to/docker-goodplugin
unversionedplugin: this plugin has no version (ACME Corp) unversionedplugin: this plugin has no version (ACME Corp)
Path: /path/to/docker-unversionedplugin
Server: Server:
Containers: 0 Containers: 0