Skip to content

Commit cb010db

Browse files
committed
Fix bug with panic when DOCKER_CLI_EXPERIMENTAL environment variable is incorrect
Signed-off-by: Daniil Nikolenko <qoo2p5@gmail.com>
1 parent 590f327 commit cb010db

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

cli/command/cli.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,9 @@ func (cli *DockerCli) ServerInfo() ServerInfo {
144144
// ClientInfo returns the client details for the cli
145145
func (cli *DockerCli) ClientInfo() ClientInfo {
146146
if cli.clientInfo == nil {
147-
_ = cli.loadClientInfo()
147+
if err := cli.loadClientInfo(); err != nil {
148+
panic(err)
149+
}
148150
}
149151
return *cli.clientInfo
150152
}
@@ -273,6 +275,11 @@ func (cli *DockerCli) Initialize(opts *cliflags.ClientOptions, ops ...Initialize
273275
}
274276
}
275277
cli.initializeFromClient()
278+
279+
if err := cli.loadClientInfo(); err != nil {
280+
return err
281+
}
282+
276283
return nil
277284
}
278285

0 commit comments

Comments
 (0)