From e90b6bcb62e266bc7763a8fb360dd2bd1741bebc Mon Sep 17 00:00:00 2001 From: Daniil Nikolenko Date: Sun, 24 May 2020 23:21:20 +0300 Subject: [PATCH] Fix bug with panic when DOCKER_CLI_EXPERIMENTAL environment variable is incorrect Signed-off-by: Daniil Nikolenko (cherry picked from commit cb010db830a60f53ef1685d99612d23fde93bec9) Signed-off-by: Tibor Vass --- cli/command/cli.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cli/command/cli.go b/cli/command/cli.go index 11db8aaa42dd..0eafa013662f 100644 --- a/cli/command/cli.go +++ b/cli/command/cli.go @@ -148,7 +148,9 @@ func (cli *DockerCli) ServerInfo() ServerInfo { // ClientInfo returns the client details for the cli func (cli *DockerCli) ClientInfo() ClientInfo { if cli.clientInfo == nil { - _ = cli.loadClientInfo() + if err := cli.loadClientInfo(); err != nil { + panic(err) + } } return *cli.clientInfo } @@ -277,6 +279,11 @@ func (cli *DockerCli) Initialize(opts *cliflags.ClientOptions, ops ...Initialize } } cli.initializeFromClient() + + if err := cli.loadClientInfo(); err != nil { + return err + } + return nil }