From 3b26cfce8b7af1073b28bb78eb185a0689dbfcbf Mon Sep 17 00:00:00 2001 From: Jean-Christophe Sirot Date: Mon, 25 Feb 2019 17:35:53 +0100 Subject: [PATCH] Always initialize context store Signed-off-by: Jean-Christophe Sirot --- cli/command/cli.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cli/command/cli.go b/cli/command/cli.go index 47e9bdfffa..55858aedbc 100644 --- a/cli/command/cli.go +++ b/cli/command/cli.go @@ -209,12 +209,13 @@ func (cli *DockerCli) Initialize(opts *cliflags.ClientOptions, ops ...Initialize cli.configFile = cliconfig.LoadDefaultConfigFile(cli.err) + cli.contextStore = store.New(cliconfig.ContextStoreDir(), cli.contextStoreConfig) + cli.currentContext, err = resolveContextName(opts.Common, cli.configFile, cli.contextStore) + if err != nil { + return err + } + if cli.client == nil { - cli.contextStore = store.New(cliconfig.ContextStoreDir(), cli.contextStoreConfig) - cli.currentContext, err = resolveContextName(opts.Common, cli.configFile, cli.contextStore) - if err != nil { - return err - } endpoint, err := resolveDockerEndpoint(cli.contextStore, cli.currentContext, opts.Common) if err != nil { return errors.Wrap(err, "unable to resolve docker endpoint")