Revert "Partially revert cf663b5 as it breaks the version negotiation…

… with an older docker engine." This reverts commit 7b2fac4. Signed-off-by: Tibor Vass <[email protected]>
docker · May 19, 2020 · 2ea2f6c · 2ea2f6c
1 parent f575a33
commit 2ea2f6c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/cli/command/cli.go b/cli/command/cli.go
@@ -9,6 +9,7 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/docker/cli/cli/config"
@@ -139,9 +140,12 @@ func (cli *DockerCli) loadConfigFile() {
 	cli.configFile = cliconfig.LoadDefaultConfigFile(cli.err)
 }
 
+var fetchServerInfo sync.Once
+
 // ServerInfo returns the server version details for the host this client is
 // connected to
 func (cli *DockerCli) ServerInfo() ServerInfo {
+	fetchServerInfo.Do(cli.initializeFromClient)
 	return cli.serverInfo
 }
 
@@ -276,7 +280,6 @@ func (cli *DockerCli) Initialize(opts *cliflags.ClientOptions, ops ...Initialize
 			return err
 		}
 	}
-	cli.initializeFromClient()
 	return nil
 }