From cb010db830a60f53ef1685d99612d23fde93bec9 Mon Sep 17 00:00:00 2001
From: Daniil Nikolenko <qoo2p5@gmail.com>
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 <qoo2p5@gmail.com>
---
 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 2081c8f46b..a9e7e30763 100644
--- 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
 }