Merge pull request #1509 from docker/pause_project_name

ndeloof · web-flow · commit d073c93ff720 · 2021-04-08T10:00:16.000+02:00
pause/unpause only need project name. use getContainers where possible
diff --git a/aci/compose.go b/aci/compose.go
@@ -72,11 +72,11 @@ func (cs *aciComposeService) Stop(ctx context.Context, project *types.Project, o
 	return errdefs.ErrNotImplemented
 }
 
-func (cs *aciComposeService) Pause(ctx context.Context, project *types.Project) error {
+func (cs *aciComposeService) Pause(ctx context.Context, project string, options compose.PauseOptions) error {
 	return errdefs.ErrNotImplemented
 }
 
-func (cs *aciComposeService) UnPause(ctx context.Context, project *types.Project) error {
+func (cs *aciComposeService) UnPause(ctx context.Context, project string, options compose.PauseOptions) error {
 	return errdefs.ErrNotImplemented
 }
 
diff --git a/api/client/compose.go b/api/client/compose.go
@@ -96,11 +96,11 @@ func (c *composeService) Exec(ctx context.Context, project *types.Project, opts
 	return errdefs.ErrNotImplemented
 }
 
-func (c *composeService) Pause(ctx context.Context, project *types.Project) error {
+func (c *composeService) Pause(ctx context.Context, project string, options compose.PauseOptions) error {
 	return errdefs.ErrNotImplemented
 }
 
-func (c *composeService) UnPause(ctx context.Context, project *types.Project) error {
+func (c *composeService) UnPause(ctx context.Context, project string, options compose.PauseOptions) error {
 	return errdefs.ErrNotImplemented
 }
 
diff --git a/api/compose/api.go b/api/compose/api.go
@@ -63,9 +63,9 @@ type Service interface {
 	// Exec executes a command in a running service container
 	Exec(ctx context.Context, project *types.Project, opts RunOptions) error
 	// Pause executes the equivalent to a `compose pause`
-	Pause(ctx context.Context, project *types.Project) error
+	Pause(ctx context.Context, project string, options PauseOptions) error
 	// UnPause executes the equivalent to a `compose unpause`
-	UnPause(ctx context.Context, project *types.Project) error
+	UnPause(ctx context.Context, project string, options PauseOptions) error
 	// Top executes the equivalent to a `compose top`
 	Top(ctx context.Context, projectName string, services []string) ([]ContainerProcSummary, error)
 	// Events executes the equivalent to a `compose events`
@@ -303,6 +303,12 @@ type LogOptions struct {
 	Timestamps bool
 }
 
+// PauseOptions group options of the Pause API
+type PauseOptions struct {
+	// Services passed in the command line to be started
+	Services []string
+}
+
 const (
 	// STARTING indicates that stack is being deployed
 	STARTING string = "Starting"
diff --git a/cli/cmd/compose/pause.go b/cli/cmd/compose/pause.go
@@ -22,6 +22,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/api/client"
+	"github.com/docker/compose-cli/api/compose"
 	"github.com/docker/compose-cli/api/progress"
 )
 
@@ -49,13 +50,15 @@ func runPause(ctx context.Context, opts pauseOptions, services []string) error {
 		return err
 	}
 
-	project, err := opts.toProject(services)
+	project, err := opts.toProjectName()
 	if err != nil {
 		return err
 	}
 
 	_, err = progress.Run(ctx, func(ctx context.Context) (string, error) {
-		return "", c.ComposeService().Pause(ctx, project)
+		return "", c.ComposeService().Pause(ctx, project, compose.PauseOptions{
+			Services: services,
+		})
 	})
 	return err
 }
@@ -84,13 +87,15 @@ func runUnPause(ctx context.Context, opts unpauseOptions, services []string) err
 		return err
 	}
 
-	project, err := opts.toProject(services)
+	project, err := opts.toProjectName()
 	if err != nil {
 		return err
 	}
 
 	_, err = progress.Run(ctx, func(ctx context.Context) (string, error) {
-		return "", c.ComposeService().UnPause(ctx, project)
+		return "", c.ComposeService().UnPause(ctx, project, compose.PauseOptions{
+			Services: services,
+		})
 	})
 	return err
 }
diff --git a/ecs/local/compose.go b/ecs/local/compose.go
@@ -188,12 +188,12 @@ func (e ecsLocalSimulation) Exec(ctx context.Context, project *types.Project, op
 	return errdefs.ErrNotImplemented
 }
 
-func (e ecsLocalSimulation) Pause(ctx context.Context, project *types.Project) error {
-	return e.compose.Pause(ctx, project)
+func (e ecsLocalSimulation) Pause(ctx context.Context, project string, options compose.PauseOptions) error {
+	return e.compose.Pause(ctx, project, options)
 }
 
-func (e ecsLocalSimulation) UnPause(ctx context.Context, project *types.Project) error {
-	return e.compose.UnPause(ctx, project)
+func (e ecsLocalSimulation) UnPause(ctx context.Context, project string, options compose.PauseOptions) error {
+	return e.compose.UnPause(ctx, project, options)
 }
 
 func (e ecsLocalSimulation) Top(ctx context.Context, projectName string, services []string) ([]compose.ContainerProcSummary, error) {
diff --git a/ecs/up.go b/ecs/up.go
@@ -59,11 +59,11 @@ func (b *ecsAPIService) Stop(ctx context.Context, project *types.Project, option
 	return errdefs.ErrNotImplemented
 }
 
-func (b *ecsAPIService) Pause(ctx context.Context, project *types.Project) error {
+func (b *ecsAPIService) Pause(ctx context.Context, project string, options compose.PauseOptions) error {
 	return errdefs.ErrNotImplemented
 }
 
-func (b *ecsAPIService) UnPause(ctx context.Context, project *types.Project) error {
+func (b *ecsAPIService) UnPause(ctx context.Context, project string, options compose.PauseOptions) error {
 	return errdefs.ErrNotImplemented
 }
 
diff --git a/kube/compose.go b/kube/compose.go
@@ -252,11 +252,11 @@ func (s *composeService) Exec(ctx context.Context, project *types.Project, opts
 	return errdefs.ErrNotImplemented
 }
 
-func (s *composeService) Pause(ctx context.Context, project *types.Project) error {
+func (s *composeService) Pause(ctx context.Context, project string, options compose.PauseOptions) error {
 	return errdefs.ErrNotImplemented
 }
 
-func (s *composeService) UnPause(ctx context.Context, project *types.Project) error {
+func (s *composeService) UnPause(ctx context.Context, project string, options compose.PauseOptions) error {
 	return errdefs.ErrNotImplemented
 }
 
diff --git a/local/compose/attach.go b/local/compose/attach.go
@@ -33,7 +33,7 @@ import (
 )
 
 func (s *composeService) attach(ctx context.Context, project *types.Project, listener compose.ContainerEventListener, selectedServices []string) (Containers, error) {
-	containers, err := s.getContainers(ctx, project, oneOffExclude, selectedServices)
+	containers, err := s.getContainers(ctx, project.Name, oneOffExclude, true, selectedServices...)
 	if err != nil {
 		return nil, err
 	}
diff --git a/local/compose/containers.go b/local/compose/containers.go
@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/compose-spec/compose-go/types"
 	moby "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 
@@ -39,10 +38,10 @@ const (
 	oneOffOnly
 )
 
-func (s *composeService) getContainers(ctx context.Context, project *types.Project, oneOff oneOff, selectedServices []string) (Containers, error) {
+func (s *composeService) getContainers(ctx context.Context, project string, oneOff oneOff, stopped bool, selectedServices ...string) (Containers, error) {
 	var containers Containers
 	f := filters.NewArgs(
-		projectFilter(project.Name),
+		projectFilter(project),
 	)
 	switch oneOff {
 	case oneOffOnly:
@@ -53,15 +52,14 @@ func (s *composeService) getContainers(ctx context.Context, project *types.Proje
 	}
 	containers, err := s.apiClient.ContainerList(ctx, moby.ContainerListOptions{
 		Filters: f,
-		All:     true,
+		All:     stopped,
 	})
 	if err != nil {
 		return nil, err
 	}
-	if len(selectedServices) == 0 {
-		selectedServices = project.ServiceNames()
+	if len(selectedServices) > 0 {
+		containers = containers.filter(isService(selectedServices...))
 	}
-	containers = containers.filter(isService(selectedServices...))
 	return containers, nil
 }
 
diff --git a/local/compose/create.go b/local/compose/create.go
@@ -26,7 +26,6 @@ import (
 	"github.com/compose-spec/compose-go/types"
 	moby "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/strslice"
@@ -69,10 +68,7 @@ func (s *composeService) Create(ctx context.Context, project *types.Project, opt
 	}
 
 	var observedState Containers
-	observedState, err = s.apiClient.ContainerList(ctx, moby.ContainerListOptions{
-		Filters: filters.NewArgs(projectFilter(project.Name)),
-		All:     true,
-	})
+	observedState, err = s.getContainers(ctx, project.Name, oneOffInclude, true)
 	if err != nil {
 		return err
 	}
diff --git a/local/compose/down.go b/local/compose/down.go
@@ -39,10 +39,7 @@ func (s *composeService) Down(ctx context.Context, projectName string, options c
 	resourceToRemove := false
 
 	var containers Containers
-	containers, err := s.apiClient.ContainerList(ctx, moby.ContainerListOptions{
-		Filters: filters.NewArgs(projectFilter(projectName)),
-		All:     true,
-	})
+	containers, err := s.getContainers(ctx, projectName, oneOffInclude, true)
 	if err != nil {
 		return err
 	}
diff --git a/local/compose/kill.go b/local/compose/kill.go
@@ -21,7 +21,6 @@ import (
 
 	"github.com/compose-spec/compose-go/types"
 	moby "github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
 	"golang.org/x/sync/errgroup"
 
 	"github.com/docker/compose-cli/api/compose"
@@ -32,10 +31,7 @@ func (s *composeService) Kill(ctx context.Context, project *types.Project, optio
 	w := progress.ContextWriter(ctx)
 
 	var containers Containers
-	containers, err := s.apiClient.ContainerList(ctx, moby.ContainerListOptions{
-		Filters: filters.NewArgs(projectFilter(project.Name)),
-		All:     true,
-	})
+	containers, err := s.getContainers(ctx, project.Name, oneOffInclude, true)
 	if err != nil {
 		return err
 	}
diff --git a/local/compose/labels.go b/local/compose/labels.go
@@ -18,8 +18,6 @@ package compose
 
 import (
 	"fmt"
-	"strconv"
-	"strings"
 
 	"github.com/docker/docker/api/types/filters"
 
@@ -47,10 +45,6 @@ func projectFilter(projectName string) filters.KeyValuePair {
 	return filters.Arg("label", fmt.Sprintf("%s=%s", projectLabel, projectName))
 }
 
-func oneOffFilter(oneOff bool) filters.KeyValuePair {
-	return filters.Arg("label", fmt.Sprintf("%s=%s", oneoffLabel, strings.Title(strconv.FormatBool(oneOff))))
-}
-
 func serviceFilter(serviceName string) filters.KeyValuePair {
 	return filters.Arg("label", fmt.Sprintf("%s=%s", serviceLabel, serviceName))
 }
diff --git a/local/compose/logs.go b/local/compose/logs.go
@@ -24,28 +24,12 @@ import (
 	"github.com/docker/compose-cli/utils"
 
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/pkg/stdcopy"
 	"golang.org/x/sync/errgroup"
 )
 
 func (s *composeService) Logs(ctx context.Context, projectName string, consumer compose.LogConsumer, options compose.LogOptions) error {
-	list, err := s.apiClient.ContainerList(ctx, types.ContainerListOptions{
-		Filters: filters.NewArgs(
-			projectFilter(projectName),
-			oneOffFilter(false),
-		),
-		All: true,
-	})
-
-	ignore := func(string) bool {
-		return false
-	}
-	if len(options.Services) > 0 {
-		ignore = func(s string) bool {
-			return !utils.StringContains(options.Services, s)
-		}
-	}
+	list, err := s.getContainers(ctx, projectName, oneOffExclude, true, options.Services...)
 
 	if err != nil {
 		return err
@@ -54,9 +38,6 @@ func (s *composeService) Logs(ctx context.Context, projectName string, consumer
 	for _, c := range list {
 		c := c
 		service := c.Labels[serviceLabel]
-		if ignore(service) {
-			continue
-		}
 		container, err := s.apiClient.ContainerInspect(ctx, c.ID)
 		if err != nil {
 			return err
diff --git a/local/compose/pause.go b/local/compose/pause.go
@@ -19,15 +19,15 @@ package compose
 import (
 	"context"
 
-	"github.com/compose-spec/compose-go/types"
 	moby "github.com/docker/docker/api/types"
 	"golang.org/x/sync/errgroup"
 
+	"github.com/docker/compose-cli/api/compose"
 	"github.com/docker/compose-cli/api/progress"
 )
 
-func (s *composeService) Pause(ctx context.Context, project *types.Project) error {
-	containers, err := s.getContainers(ctx, project, oneOffExclude, nil)
+func (s *composeService) Pause(ctx context.Context, project string, options compose.PauseOptions) error {
+	containers, err := s.getContainers(ctx, project, oneOffExclude, true, options.Services...)
 	if err != nil {
 		return err
 	}
@@ -48,8 +48,8 @@ func (s *composeService) Pause(ctx context.Context, project *types.Project) erro
 	return eg.Wait()
 }
 
-func (s *composeService) UnPause(ctx context.Context, project *types.Project) error {
-	containers, err := s.getContainers(ctx, project, oneOffExclude, nil)
+func (s *composeService) UnPause(ctx context.Context, project string, options compose.PauseOptions) error {
+	containers, err := s.getContainers(ctx, project, oneOffExclude, true, options.Services...)
 	if err != nil {
 		return err
 	}
diff --git a/local/compose/ps.go b/local/compose/ps.go
@@ -20,18 +20,13 @@ import (
 	"context"
 	"fmt"
 
-	moby "github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
 	"golang.org/x/sync/errgroup"
 
 	"github.com/docker/compose-cli/api/compose"
 )
 
 func (s *composeService) Ps(ctx context.Context, projectName string, options compose.PsOptions) ([]compose.ContainerSummary, error) {
-	containers, err := s.apiClient.ContainerList(ctx, moby.ContainerListOptions{
-		Filters: filters.NewArgs(projectFilter(projectName)),
-		All:     options.All,
-	})
+	containers, err := s.getContainers(ctx, projectName, oneOffInclude, options.All)
 	if err != nil {
 		return nil, err
 	}
diff --git a/local/compose/remove.go b/local/compose/remove.go
@@ -29,7 +29,7 @@ import (
 )
 
 func (s *composeService) Remove(ctx context.Context, project *types.Project, options compose.RemoveOptions) ([]string, error) {
-	containers, err := s.getContainers(ctx, project, oneOffInclude, nil)
+	containers, err := s.getContainers(ctx, project.Name, oneOffInclude, true)
 	if err != nil {
 		return nil, err
 	}
diff --git a/local/compose/run.go b/local/compose/run.go
@@ -30,10 +30,7 @@ import (
 )
 
 func (s *composeService) RunOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) (int, error) {
-	observedState, err := s.apiClient.ContainerList(ctx, apitypes.ContainerListOptions{
-		Filters: filters.NewArgs(projectFilter(project.Name)),
-		All:     true,
-	})
+	observedState, err := s.getContainers(ctx, project.Name, oneOffInclude, true)
 	if err != nil {
 		return 0, err
 	}
diff --git a/local/compose/status.go b/local/compose/status.go
@@ -20,7 +20,6 @@ import (
 	"context"
 
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
 	"github.com/pkg/errors"
 )
 
@@ -103,12 +102,7 @@ func GetContextContainerState(ctx context.Context) (ContainersState, error) {
 }
 
 func (s composeService) getUpdatedContainersStateContext(ctx context.Context, projectName string) (context.Context, error) {
-	observedState, err := s.apiClient.ContainerList(ctx, types.ContainerListOptions{
-		Filters: filters.NewArgs(
-			projectFilter(projectName),
-		),
-		All: true,
-	})
+	observedState, err := s.getContainers(ctx, projectName, oneOffInclude, true)
 	if err != nil {
 		return nil, err
 	}
diff --git a/local/compose/stop.go b/local/compose/stop.go
diff --git a/local/compose/top.go b/local/compose/top.go

Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,11 @@ func (cs aciComposeService) Stop(ctx context.Context, project types.Project, o`
`72`	`72`	`return errdefs.ErrNotImplemented`
`73`	`73`	`}`
`74`	`74`
`75`		`-func (cs aciComposeService) Pause(ctx context.Context, project types.Project) error {`
	`75`	`+func (cs *aciComposeService) Pause(ctx context.Context, project string, options compose.PauseOptions) error {`
`76`	`76`	`return errdefs.ErrNotImplemented`
`77`	`77`	`}`
`78`	`78`
`79`		`-func (cs aciComposeService) UnPause(ctx context.Context, project types.Project) error {`
	`79`	`+func (cs *aciComposeService) UnPause(ctx context.Context, project string, options compose.PauseOptions) error {`
`80`	`80`	`return errdefs.ErrNotImplemented`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -96,11 +96,11 @@ func (c composeService) Exec(ctx context.Context, project types.Project, opts`
`96`	`96`	`return errdefs.ErrNotImplemented`
`97`	`97`	`}`
`98`	`98`
`99`		`-func (c composeService) Pause(ctx context.Context, project types.Project) error {`
	`99`	`+func (c *composeService) Pause(ctx context.Context, project string, options compose.PauseOptions) error {`
`100`	`100`	`return errdefs.ErrNotImplemented`
`101`	`101`	`}`
`102`	`102`
`103`		`-func (c composeService) UnPause(ctx context.Context, project types.Project) error {`
	`103`	`+func (c *composeService) UnPause(ctx context.Context, project string, options compose.PauseOptions) error {`
`104`	`104`	`return errdefs.ErrNotImplemented`
`105`	`105`	`}`
`106`	`106`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ import (`
`22`	`22`	`"github.com/spf13/cobra"`
`23`	`23`
`24`	`24`	`"github.com/docker/compose-cli/api/client"`
	`25`	`+ "github.com/docker/compose-cli/api/compose"`
`25`	`26`	`"github.com/docker/compose-cli/api/progress"`
`26`	`27`	`)`
`27`	`28`
`@@ -49,13 +50,15 @@ func runPause(ctx context.Context, opts pauseOptions, services []string) error {`
`49`	`50`	`return err`
`50`	`51`	`}`
`51`	`52`
`52`		`- project, err := opts.toProject(services)`
	`53`	`+ project, err := opts.toProjectName()`
`53`	`54`	`if err != nil {`
`54`	`55`	`return err`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`_, err = progress.Run(ctx, func(ctx context.Context) (string, error) {`
`58`		`- return "", c.ComposeService().Pause(ctx, project)`
	`59`	`+ return "", c.ComposeService().Pause(ctx, project, compose.PauseOptions{`
	`60`	`+ Services: services,`
	`61`	`+ })`
`59`	`62`	`})`
`60`	`63`	`return err`
`61`	`64`	`}`
`@@ -84,13 +87,15 @@ func runUnPause(ctx context.Context, opts unpauseOptions, services []string) err`
`84`	`87`	`return err`
`85`	`88`	`}`
`86`	`89`
`87`		`- project, err := opts.toProject(services)`
	`90`	`+ project, err := opts.toProjectName()`
`88`	`91`	`if err != nil {`
`89`	`92`	`return err`
`90`	`93`	`}`
`91`	`94`
`92`	`95`	`_, err = progress.Run(ctx, func(ctx context.Context) (string, error) {`
`93`		`- return "", c.ComposeService().UnPause(ctx, project)`
	`96`	`+ return "", c.ComposeService().UnPause(ctx, project, compose.PauseOptions{`
	`97`	`+ Services: services,`
	`98`	`+ })`
`94`	`99`	`})`
`95`	`100`	`return err`
`96`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,12 +188,12 @@ func (e ecsLocalSimulation) Exec(ctx context.Context, project *types.Project, op`
`188`	`188`	`return errdefs.ErrNotImplemented`
`189`	`189`	`}`
`190`	`190`
`191`		`-func (e ecsLocalSimulation) Pause(ctx context.Context, project *types.Project) error {`
`192`		`- return e.compose.Pause(ctx, project)`
	`191`	`+func (e ecsLocalSimulation) Pause(ctx context.Context, project string, options compose.PauseOptions) error {`
	`192`	`+ return e.compose.Pause(ctx, project, options)`
`193`	`193`	`}`
`194`	`194`
`195`		`-func (e ecsLocalSimulation) UnPause(ctx context.Context, project *types.Project) error {`
`196`		`- return e.compose.UnPause(ctx, project)`
	`195`	`+func (e ecsLocalSimulation) UnPause(ctx context.Context, project string, options compose.PauseOptions) error {`
	`196`	`+ return e.compose.UnPause(ctx, project, options)`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`func (e ecsLocalSimulation) Top(ctx context.Context, projectName string, services []string) ([]compose.ContainerProcSummary, error) {`
Original file line number	Diff line number	Diff line change
`@@ -59,11 +59,11 @@ func (b ecsAPIService) Stop(ctx context.Context, project types.Project, option`
`59`	`59`	`return errdefs.ErrNotImplemented`
`60`	`60`	`}`
`61`	`61`
`62`		`-func (b ecsAPIService) Pause(ctx context.Context, project types.Project) error {`
	`62`	`+func (b *ecsAPIService) Pause(ctx context.Context, project string, options compose.PauseOptions) error {`
`63`	`63`	`return errdefs.ErrNotImplemented`
`64`	`64`	`}`
`65`	`65`
`66`		`-func (b ecsAPIService) UnPause(ctx context.Context, project types.Project) error {`
	`66`	`+func (b *ecsAPIService) UnPause(ctx context.Context, project string, options compose.PauseOptions) error {`
`67`	`67`	`return errdefs.ErrNotImplemented`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -252,11 +252,11 @@ func (s composeService) Exec(ctx context.Context, project types.Project, opts`
`252`	`252`	`return errdefs.ErrNotImplemented`
`253`	`253`	`}`
`254`	`254`
`255`		`-func (s composeService) Pause(ctx context.Context, project types.Project) error {`
	`255`	`+func (s *composeService) Pause(ctx context.Context, project string, options compose.PauseOptions) error {`
`256`	`256`	`return errdefs.ErrNotImplemented`
`257`	`257`	`}`
`258`	`258`
`259`		`-func (s composeService) UnPause(ctx context.Context, project types.Project) error {`
	`259`	`+func (s *composeService) UnPause(ctx context.Context, project string, options compose.PauseOptions) error {`
`260`	`260`	`return errdefs.ErrNotImplemented`
`261`	`261`	`}`
`262`	`262`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ import (`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`func (s composeService) attach(ctx context.Context, project types.Project, listener compose.ContainerEventListener, selectedServices []string) (Containers, error) {`
`36`		`- containers, err := s.getContainers(ctx, project, oneOffExclude, selectedServices)`
	`36`	`+ containers, err := s.getContainers(ctx, project.Name, oneOffExclude, true, selectedServices...)`
`37`	`37`	`if err != nil {`
`38`	`38`	`return nil, err`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ import (`
`21`	`21`	`"fmt"`
`22`	`22`	`"sort"`
`23`	`23`
`24`		`- "github.com/compose-spec/compose-go/types"`
`25`	`24`	`moby "github.com/docker/docker/api/types"`
`26`	`25`	`"github.com/docker/docker/api/types/filters"`
`27`	`26`
`@@ -39,10 +38,10 @@ const (`
`39`	`38`	`oneOffOnly`
`40`	`39`	`)`
`41`	`40`
`42`		`-func (s composeService) getContainers(ctx context.Context, project types.Project, oneOff oneOff, selectedServices []string) (Containers, error) {`
	`41`	`+func (s *composeService) getContainers(ctx context.Context, project string, oneOff oneOff, stopped bool, selectedServices ...string) (Containers, error) {`
`43`	`42`	`var containers Containers`
`44`	`43`	`f := filters.NewArgs(`
`45`		`- projectFilter(project.Name),`
	`44`	`+ projectFilter(project),`
`46`	`45`	`)`
`47`	`46`	`switch oneOff {`
`48`	`47`	`case oneOffOnly:`
`@@ -53,15 +52,14 @@ func (s composeService) getContainers(ctx context.Context, project types.Proje`
`53`	`52`	`}`
`54`	`53`	`containers, err := s.apiClient.ContainerList(ctx, moby.ContainerListOptions{`
`55`	`54`	`Filters: f,`
`56`		`- All: true,`
	`55`	`+ All: stopped,`
`57`	`56`	`})`
`58`	`57`	`if err != nil {`
`59`	`58`	`return nil, err`
`60`	`59`	`}`
`61`		`- if len(selectedServices) == 0 {`
`62`		`- selectedServices = project.ServiceNames()`
	`60`	`+ if len(selectedServices) > 0 {`
	`61`	`+ containers = containers.filter(isService(selectedServices...))`
`63`	`62`	`}`
`64`		`- containers = containers.filter(isService(selectedServices...))`
`65`	`63`	`return containers, nil`
`66`	`64`	`}`
`67`	`65`