From d35b50c0c3392f05f58d4233e326dd4467ecd1cb Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 3 Mar 2021 12:07:01 +0100 Subject: [PATCH] NewAPIClientFromFlags: rename variable to not collide with import Signed-off-by: Sebastiaan van Stijn --- cli/command/cli.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/command/cli.go b/cli/command/cli.go index 7e9ed3c8f5..103184d4de 100644 --- a/cli/command/cli.go +++ b/cli/command/cli.go @@ -271,17 +271,17 @@ func (cli *DockerCli) Initialize(opts *cliflags.ClientOptions, ops ...Initialize // NewAPIClientFromFlags creates a new APIClient from command line flags func NewAPIClientFromFlags(opts *cliflags.CommonOptions, configFile *configfile.ConfigFile) (client.APIClient, error) { storeConfig := DefaultContextStoreConfig() - store := &ContextStoreWithDefault{ + contextStore := &ContextStoreWithDefault{ Store: store.New(cliconfig.ContextStoreDir(), storeConfig), Resolver: func() (*DefaultContext, error) { return ResolveDefaultContext(opts, configFile, storeConfig, io.Discard) }, } - contextName, err := resolveContextName(opts, configFile, store) + contextName, err := resolveContextName(opts, configFile, contextStore) if err != nil { return nil, err } - endpoint, err := resolveDockerEndpoint(store, contextName) + endpoint, err := resolveDockerEndpoint(contextStore, contextName) if err != nil { return nil, errors.Wrap(err, "unable to resolve docker endpoint") }