diff --git a/cmd/compose/compose.go b/cmd/compose/compose.go index 43f91d2f2..024d6589d 100644 --- a/cmd/compose/compose.go +++ b/cmd/compose/compose.go @@ -137,11 +137,11 @@ func (o *projectOptions) addProjectFlags(f *pflag.FlagSet) { _ = f.MarkHidden("workdir") } -func (o *projectOptions) projectOrName() (*types.Project, string, error) { +func (o *projectOptions) projectOrName(services ...string) (*types.Project, string, error) { name := o.ProjectName var project *types.Project if o.ProjectName == "" { - p, err := o.toProject(nil) + p, err := o.toProject(services) if err != nil { envProjectName := os.Getenv("COMPOSE_PROJECT_NAME") if envProjectName != "" { diff --git a/cmd/compose/kill.go b/cmd/compose/kill.go index 68c0f35a4..fc759c00a 100644 --- a/cmd/compose/kill.go +++ b/cmd/compose/kill.go @@ -54,7 +54,7 @@ func killCommand(p *projectOptions, backend api.Service) *cobra.Command { } func runKill(ctx context.Context, backend api.Service, opts killOptions, services []string) error { - project, name, err := opts.projectOrName() + project, name, err := opts.projectOrName(services...) if err != nil { return err } diff --git a/cmd/compose/logs.go b/cmd/compose/logs.go index 767fa8643..afaec851c 100644 --- a/cmd/compose/logs.go +++ b/cmd/compose/logs.go @@ -63,7 +63,7 @@ func logsCommand(p *projectOptions, backend api.Service) *cobra.Command { } func runLogs(ctx context.Context, backend api.Service, opts logsOptions, services []string) error { - project, name, err := opts.projectOrName() + project, name, err := opts.projectOrName(services...) if err != nil { return err } diff --git a/cmd/compose/pause.go b/cmd/compose/pause.go index 6072c0bf4..74c927494 100644 --- a/cmd/compose/pause.go +++ b/cmd/compose/pause.go @@ -44,7 +44,7 @@ func pauseCommand(p *projectOptions, backend api.Service) *cobra.Command { } func runPause(ctx context.Context, backend api.Service, opts pauseOptions, services []string) error { - project, name, err := opts.projectOrName() + project, name, err := opts.projectOrName(services...) if err != nil { return err } @@ -75,7 +75,7 @@ func unpauseCommand(p *projectOptions, backend api.Service) *cobra.Command { } func runUnPause(ctx context.Context, backend api.Service, opts unpauseOptions, services []string) error { - project, name, err := opts.projectOrName() + project, name, err := opts.projectOrName(services...) if err != nil { return err } diff --git a/cmd/compose/ps.go b/cmd/compose/ps.go index ba90039fb..94dd1a9d1 100644 --- a/cmd/compose/ps.go +++ b/cmd/compose/ps.go @@ -91,7 +91,7 @@ func psCommand(p *projectOptions, backend api.Service) *cobra.Command { } func runPs(ctx context.Context, backend api.Service, services []string, opts psOptions) error { - project, name, err := opts.projectOrName() + project, name, err := opts.projectOrName(services...) if err != nil { return err } diff --git a/cmd/compose/remove.go b/cmd/compose/remove.go index afc54d8d5..d61d3f3cb 100644 --- a/cmd/compose/remove.go +++ b/cmd/compose/remove.go @@ -59,7 +59,7 @@ Any data which is not in a volume will be lost.`, } func runRemove(ctx context.Context, backend api.Service, opts removeOptions, services []string) error { - project, name, err := opts.projectOrName() + project, name, err := opts.projectOrName(services...) if err != nil { return err } diff --git a/cmd/compose/restart.go b/cmd/compose/restart.go index 7e2b61559..a7867df53 100644 --- a/cmd/compose/restart.go +++ b/cmd/compose/restart.go @@ -49,7 +49,7 @@ func restartCommand(p *projectOptions, backend api.Service) *cobra.Command { } func runRestart(ctx context.Context, backend api.Service, opts restartOptions, services []string) error { - project, name, err := opts.projectOrName() + project, name, err := opts.projectOrName(services...) if err != nil { return err } diff --git a/cmd/compose/start.go b/cmd/compose/start.go index 7adb3331c..737084887 100644 --- a/cmd/compose/start.go +++ b/cmd/compose/start.go @@ -43,7 +43,7 @@ func startCommand(p *projectOptions, backend api.Service) *cobra.Command { } func runStart(ctx context.Context, backend api.Service, opts startOptions, services []string) error { - project, name, err := opts.projectOrName() + project, name, err := opts.projectOrName(services...) if err != nil { return err } diff --git a/cmd/compose/stop.go b/cmd/compose/stop.go index 8ad8e7f07..281c21d37 100644 --- a/cmd/compose/stop.go +++ b/cmd/compose/stop.go @@ -53,7 +53,7 @@ func stopCommand(p *projectOptions, backend api.Service) *cobra.Command { } func runStop(ctx context.Context, backend api.Service, opts stopOptions, services []string) error { - project, name, err := opts.projectOrName() + project, name, err := opts.projectOrName(services...) if err != nil { return err }