Merge pull request #2558 from tiborvass/19.03-expenv-panic

[19.03] Fix bug with panic when DOCKER_CLI_EXPERIMENTAL environment variable is incorrect
docker · May 28, 2020 · dd360c7 · dd360c7
2 parents 92b54c2 + e90b6bc
commit dd360c7
Showing 1 changed file with 8 additions and 1 deletion.
diff --git 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
 }