Skip to content

Commit a390a32

Browse files
authored
Merge pull request #5917 from thaJeztah/prunefilters_shallow_interface
cli/command: PruneFilters: require smaller interface
2 parents 70bf6cb + d2b751c commit a390a32

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

cli/command/utils.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"runtime"
1414
"strings"
1515

16+
"github.com/docker/cli/cli/config"
1617
"github.com/docker/cli/cli/streams"
1718
"github.com/docker/docker/api/types/filters"
1819
mounttypes "github.com/docker/docker/api/types/mount"
@@ -166,11 +167,12 @@ func PromptForConfirmation(ctx context.Context, ins io.Reader, outs io.Writer, m
166167
}
167168

168169
// PruneFilters returns consolidated prune filters obtained from config.json and cli
169-
func PruneFilters(dockerCli Cli, pruneFilters filters.Args) filters.Args {
170-
if dockerCli.ConfigFile() == nil {
170+
func PruneFilters(dockerCLI config.Provider, pruneFilters filters.Args) filters.Args {
171+
cfg := dockerCLI.ConfigFile()
172+
if cfg == nil {
171173
return pruneFilters
172174
}
173-
for _, f := range dockerCli.ConfigFile().PruneFilters {
175+
for _, f := range cfg.PruneFilters {
174176
k, v, ok := strings.Cut(f, "=")
175177
if !ok {
176178
continue

0 commit comments

Comments
 (0)