Merge pull request #6467 from thaJeztah/no_apply

vvoland · web-flow · commit 7cc801d93d7d · 2025-09-24T13:17:51.000+02:00
cli/command: NewDockerCli: don't depend on DockerCli.Apply
diff --git a/cli/command/cli.go b/cli/command/cli.go
@@ -602,8 +602,10 @@ func NewDockerCli(ops ...CLIOption) (*DockerCli, error) {
 	ops = append(defaultOps, ops...)
 
 	cli := &DockerCli{baseCtx: context.Background()}
-	if err := cli.Apply(ops...); err != nil {
-		return nil, err
+	for _, op := range ops {
+		if err := op(cli); err != nil {
+			return nil, err
+		}
 	}
 	return cli, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -602,8 +602,10 @@ func NewDockerCli(ops ...CLIOption) (*DockerCli, error) {`
`602`	`602`	`ops = append(defaultOps, ops...)`
`603`	`603`
`604`	`604`	`cli := &DockerCli{baseCtx: context.Background()}`
`605`		`- if err := cli.Apply(ops...); err != nil {`
`606`		`- return nil, err`
	`605`	`+ for _, op := range ops {`
	`606`	`+ if err := op(cli); err != nil {`
	`607`	`+ return nil, err`
	`608`	`+ }`
`607`	`609`	`}`
`608`	`610`	`return cli, nil`
`609`	`611`	`}`