diff --git a/api/compose/api.go b/api/compose/api.go index c504d14fd..465b20b70 100644 --- a/api/compose/api.go +++ b/api/compose/api.go @@ -111,6 +111,7 @@ type ContainerSummary struct { Project string Service string State string + Health string Publishers []PortPublisher } diff --git a/cli/cmd/compose/ps.go b/cli/cmd/compose/ps.go index 8837d5862..d73bb18af 100644 --- a/cli/cmd/compose/ps.go +++ b/cli/cmd/compose/ps.go @@ -93,8 +93,8 @@ func runPs(ctx context.Context, opts psOptions) error { ports = append(ports, fmt.Sprintf("%s->%d/%s", p.URL, p.TargetPort, p.Protocol)) } } - _, _ = fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", container.Name, container.Service, container.State, strings.Join(ports, ", ")) + _, _ = fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", container.Name, container.Service, container.State, container.Health, strings.Join(ports, ", ")) } }, - "NAME", "SERVICE", "STATE", "PORTS") + "NAME", "SERVICE", "STATE", "HEALTH", "PORTS") } diff --git a/local/compose/ps.go b/local/compose/ps.go index 87d1218c4..264f2ecfb 100644 --- a/local/compose/ps.go +++ b/local/compose/ps.go @@ -23,6 +23,7 @@ import ( 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" ) @@ -38,32 +39,49 @@ func (s *composeService) Ps(ctx context.Context, projectName string, options com return nil, err } - var summary []compose.ContainerSummary - for _, c := range containers { - var publishers []compose.PortPublisher - for _, p := range c.Ports { - var url string - if p.PublicPort != 0 { - url = fmt.Sprintf("%s:%d", p.IP, p.PublicPort) + summary := make([]compose.ContainerSummary, len(containers)) + eg, ctx := errgroup.WithContext(ctx) + for i, c := range containers { + container := c + i := i + eg.Go(func() error { + var publishers []compose.PortPublisher + for _, p := range container.Ports { + var url string + if p.PublicPort != 0 { + url = fmt.Sprintf("%s:%d", p.IP, p.PublicPort) + } + publishers = append(publishers, compose.PortPublisher{ + URL: url, + TargetPort: int(p.PrivatePort), + PublishedPort: int(p.PublicPort), + Protocol: p.Type, + }) } - publishers = append(publishers, compose.PortPublisher{ - URL: url, - TargetPort: int(p.PrivatePort), - PublishedPort: int(p.PublicPort), - Protocol: p.Type, - }) - } - summary = append(summary, compose.ContainerSummary{ - ID: c.ID, - Name: getCanonicalContainerName(c), - Project: c.Labels[projectLabel], - Service: c.Labels[serviceLabel], - State: c.State, - Publishers: publishers, + inspect, err := s.apiClient.ContainerInspect(ctx, container.ID) + if err != nil { + return err + } + + var health string + if inspect.State != nil && inspect.State.Health != nil { + health = inspect.State.Health.Status + } + + summary[i] = compose.ContainerSummary{ + ID: container.ID, + Name: getCanonicalContainerName(container), + Project: container.Labels[projectLabel], + Service: container.Labels[serviceLabel], + State: container.State, + Health: health, + Publishers: publishers, + } + return nil }) } - return summary, nil + return summary, eg.Wait() } func groupContainerByLabel(containers []moby.Container, labelName string) (map[string][]moby.Container, []string, error) {