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

Merge pull request #3594 from thaJeztah/improve_info_formatting

This commit is contained in:
Nicolas De loof 2022-05-11 10:26:58 +02:00 committed by GitHub
parent 4cc4385075 9dc54f3fbe
commit 8b4958455e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,11 +67,12 @@ func NewInfoCommand(dockerCli command.Cli) *cobra.Command {
} }
func runInfo(cmd *cobra.Command, dockerCli command.Cli, opts *infoOptions) error { func runInfo(cmd *cobra.Command, dockerCli command.Cli, opts *infoOptions) error {
var info info info := info{
ClientInfo: &clientInfo{
info.ClientInfo = &clientInfo{ Context: dockerCli.CurrentContext(),
Context: dockerCli.CurrentContext(), Debug: debug.IsEnabled(),
Debug: debug.IsEnabled(), },
Info: &types.Info{},
} }
if plugins, err := pluginmanager.ListPlugins(dockerCli, cmd.Root()); err == nil { if plugins, err := pluginmanager.ListPlugins(dockerCli, cmd.Root()); err == nil {
info.ClientInfo.Plugins = plugins info.ClientInfo.Plugins = plugins
@ -85,6 +86,16 @@ func runInfo(cmd *cobra.Command, dockerCli command.Cli, opts *infoOptions) error
info.Info = &dinfo info.Info = &dinfo
} else { } else {
info.ServerErrors = append(info.ServerErrors, err.Error()) info.ServerErrors = append(info.ServerErrors, err.Error())
if opts.format == "" {
// reset the server info to prevent printing "empty" Server info
// and warnings, but don't reset it if a custom format was specified
// to prevent errors from Go's template parsing during format.
info.Info = nil
} else {
// if a format is provided, print the error, as it may be hidden
// otherwise if the template doesn't include the ServerErrors field.
fmt.Fprintln(dockerCli.Err(), err)
}
} }
} }