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 #8702 from ndeloof/multiple_status 

make --status a multi-value flag
This commit is contained in:
Ulysses Souza 2021-09-29 22:22:14 +02:00 committed by GitHub
parent 3dcbc13742 7f31fe678f
commit 769ff110f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cmd/compose/ps.go
View File

@ -42,7 +42,7 @@ type psOptions struct {
Quiet bool Quiet bool
Services bool Services bool
Filter string Filter string
Status string Status []string
} }
func (p *psOptions) parseFilter() error { func (p *psOptions) parseFilter() error {
@ -55,7 +55,7 @@ func (p *psOptions) parseFilter() error {
} }
switch parts[0] { switch parts[0] {
case "status": case "status":
p.Status = parts[1] p.Status = append(p.Status, parts[1])
case "source": case "source":
return api.ErrNotImplemented return api.ErrNotImplemented
default: default:
@ -82,7 +82,7 @@ func psCommand(p *projectOptions, backend api.Service) *cobra.Command {
flags := psCmd.Flags() flags := psCmd.Flags()
flags.StringVar(&opts.Format, "format", "pretty", "Format the output. Values: [pretty | json]") flags.StringVar(&opts.Format, "format", "pretty", "Format the output. Values: [pretty | json]")
flags.StringVar(&opts.Filter, "filter", "", "Filter services by a property. Deprecated, use --status instead") flags.StringVar(&opts.Filter, "filter", "", "Filter services by a property. Deprecated, use --status instead")
flags.StringVar(&opts.Status, "status", "", "Filter services by status. Values: [paused | restarting | removing | running | dead | created | exited]") flags.StringArrayVar(&opts.Status, "status", []string{}, "Filter services by status. Values: [paused | restarting | removing | running | dead | created | exited]")
flags.BoolVarP(&opts.Quiet, "quiet", "q", false, "Only display IDs") flags.BoolVarP(&opts.Quiet, "quiet", "q", false, "Only display IDs")
flags.BoolVar(&opts.Services, "services", false, "Display services") flags.BoolVar(&opts.Services, "services", false, "Display services")
flags.BoolVarP(&opts.All, "all", "a", false, "Show all stopped containers (including those created by the run command)") flags.BoolVarP(&opts.All, "all", "a", false, "Show all stopped containers (including those created by the run command)")
@ -124,7 +124,7 @@ SERVICES:
return fmt.Errorf("no such service: %s", s) return fmt.Errorf("no such service: %s", s)
} }
if opts.Status != "" { if len(opts.Status) != 0 {
containers = filterByStatus(containers, opts.Status) containers = filterByStatus(containers, opts.Status)
} }
@ -160,22 +160,25 @@ func writter(containers []api.ContainerSummary) func(w io.Writer) {
} }
} }
func filterByStatus(containers []api.ContainerSummary, status string) []api.ContainerSummary { func filterByStatus(containers []api.ContainerSummary, statuses []string) []api.ContainerSummary {
hasContainerWithState := map[string]struct{}{}
for _, c := range containers {
if c.State == status {
hasContainerWithState[c.Service] = struct{}{}
}
}
var filtered []api.ContainerSummary var filtered []api.ContainerSummary
for _, c := range containers { for _, c := range containers {
if _, ok := hasContainerWithState[c.Service]; ok { if hasStatus(c, statuses) {
filtered = append(filtered, c) filtered = append(filtered, c)
} }
} }
return filtered return filtered
} }
func hasStatus(c api.ContainerSummary, statuses []string) bool {
for _, status := range statuses {
if c.State == status {
return true
}
}
return false
}
type portRange struct { type portRange struct {
pStart int pStart int
pEnd int pEnd int