From cc08fc1af082597ff452e8c8cf411863705be7ba Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 3 Mar 2021 12:09:20 +0100 Subject: [PATCH] Implement WithDefaultContextStoreConfig() DockerCliOption Just a minor refactor to make this slightly cleaner Signed-off-by: Sebastiaan van Stijn --- cli/command/cli.go | 5 +++-- cli/command/cli_options.go | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cli/command/cli.go b/cli/command/cli.go index 103184d4de..cfa43921b3 100644 --- a/cli/command/cli.go +++ b/cli/command/cli.go @@ -422,12 +422,13 @@ type ClientInfo struct { // It applies by default the standard streams, and the content trust from // environment. func NewDockerCli(ops ...DockerCliOption) (*DockerCli, error) { - cli := &DockerCli{} defaultOps := []DockerCliOption{ WithContentTrustFromEnv(), + WithDefaultContextStoreConfig(), } - cli.contextStoreConfig = DefaultContextStoreConfig() ops = append(defaultOps, ops...) + + cli := &DockerCli{} if err := cli.Apply(ops...); err != nil { return nil, err } diff --git a/cli/command/cli_options.go b/cli/command/cli_options.go index 290cae45c3..cd81794982 100644 --- a/cli/command/cli_options.go +++ b/cli/command/cli_options.go @@ -94,3 +94,11 @@ func WithContextEndpointType(endpointName string, endpointType store.TypeGetter) return nil } } + +// WithDefaultContextStoreConfig configures the cli to use the default context store configuration. +func WithDefaultContextStoreConfig() DockerCliOption { + return func(cli *DockerCli) error { + cli.contextStoreConfig = DefaultContextStoreConfig() + return nil + } +}