tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't use unitialized cli to setup DryRunClient 

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2023-07-04 15:38:57 +02:00 committed by Nicolas De loof
parent b1334b8dfc
commit b5f5e27597
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/dryrunclient.go
View File

@ -70,7 +70,7 @@ type execDetails struct {
} }
// NewDryRunClient produces a DryRunClient // NewDryRunClient produces a DryRunClient
func NewDryRunClient(apiClient client.APIClient, cli *command.DockerCli) (*DryRunClient, error) { func NewDryRunClient(apiClient client.APIClient, cli command.Cli) (*DryRunClient, error) {
b, err := builder.New(cli, builder.WithSkippedValidation()) b, err := builder.New(cli, builder.WithSkippedValidation())
if err != nil { if err != nil {
return nil, err return nil, err

7
pkg/compose/compose.go
View File

@ -88,8 +88,11 @@ func (s *composeService) DryRunMode(ctx context.Context, dryRun bool) (context.C
if err != nil { if err != nil {
return ctx, err return ctx, err
} }
err = cli.Initialize(flags.NewClientOptions(), command.WithInitializeClient(func(cli *command.DockerCli) (client.APIClient, error) {
return api.NewDryRunClient(s.apiClient(), cli) options := flags.NewClientOptions()
options.Context = s.dockerCli.CurrentContext()
err = cli.Initialize(options, command.WithInitializeClient(func(cli *command.DockerCli) (client.APIClient, error) {
return api.NewDryRunClient(s.apiClient(), s.dockerCli)
})) }))
if err != nil { if err != nil {
return ctx, err return ctx, err