Fix bug with panic when DOCKER_CLI_EXPERIMENTAL environment variable …

…is incorrect Signed-off-by: Daniil Nikolenko <[email protected]>
docker · May 24, 2020 · cb010db · cb010db
1 parent 590f327
commit cb010db
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/cli/command/cli.go b/cli/command/cli.go
@@ -144,7 +144,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
 }
@@ -273,6 +275,11 @@ func (cli *DockerCli) Initialize(opts *cliflags.ClientOptions, ops ...Initialize
 		}
 	}
 	cli.initializeFromClient()
+
+	if err := cli.loadClientInfo(); err != nil {
+		return err
+	}
+
 	return nil
 }