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

Merge pull request #1649 from ndeloof/ps_all

This commit is contained in:
Nicolas De loof 2021-05-06 12:15:15 +02:00 committed by GitHub
parent f1aaab1943 f40846126e
commit 59efedf043
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
local/compose/ps.go
View File

@ -26,7 +26,11 @@ import (
)
func (s *composeService) Ps(ctx context.Context, projectName string, options compose.PsOptions) ([]compose.ContainerSummary, error) {
containers, err := s.getContainers(ctx, projectName, oneOffInclude, options.All, options.Services...)
oneOff := oneOffExclude
if options.All {
oneOff = oneOffInclude
}
containers, err := s.getContainers(ctx, projectName, oneOff, true, options.Services...)
if err != nil {
return nil, err
}

4
local/compose/ps_test.go
View File

@ -37,7 +37,9 @@ func TestPs(t *testing.T) {
tested.apiClient = api
ctx := context.Background()
listOpts := apitypes.ContainerListOptions{Filters: filters.NewArgs(projectFilter(testProject)), All: false}
args := filters.NewArgs(projectFilter(testProject))
args.Add("label", "com.docker.compose.oneoff=False")
listOpts := apitypes.ContainerListOptions{Filters: args, All: true}
c1, inspect1 := containerDetails("service1", "123", "Running", "healthy")
c2, inspect2 := containerDetails("service1", "456", "Running", "")
c2.Ports = []apitypes.Port{{PublicPort: 80, PrivatePort: 90, IP: "localhost"}}