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

Fix bug with panic when DOCKER_CLI_EXPERIMENTAL environment variable is incorrect 

Signed-off-by: Daniil Nikolenko <qoo2p5@gmail.com>
(cherry picked from commit cb010db830)
Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Daniil Nikolenko 2020-05-24 23:21:20 +03:00 committed by Tibor Vass
parent fd7874f16d
commit e90b6bcb62
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cli/command/cli.go
View File

@ -148,7 +148,9 @@ func (cli *DockerCli) ServerInfo() ServerInfo {
// ClientInfo returns the client details for the cli // ClientInfo returns the client details for the cli
func (cli *DockerCli) ClientInfo() ClientInfo { func (cli *DockerCli) ClientInfo() ClientInfo {
if cli.clientInfo == nil { if cli.clientInfo == nil {
_ = cli.loadClientInfo() if err := cli.loadClientInfo(); err != nil {
panic(err)
}
} }
return *cli.clientInfo return *cli.clientInfo
} }
@ -277,6 +279,11 @@ func (cli *DockerCli) Initialize(opts *cliflags.ClientOptions, ops ...Initialize
} }
} }
cli.initializeFromClient() cli.initializeFromClient()
if err := cli.loadClientInfo(); err != nil {
return err
}
return nil return nil
} }