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 #1211 from docker/health 

Add HEALTH column to compose ps
This commit is contained in:
Nicolas De loof 2021-02-02 16:58:26 +01:00 committed by GitHub
parent 9ef7850076 c4f6b1bd14
commit 4d3d7c11ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/compose/api.go
View File

@ -111,6 +111,7 @@ type ContainerSummary struct {
Project string Project string
Service string Service string
State string State string
Health string
Publishers []PortPublisher Publishers []PortPublisher
} }

4
cli/cmd/compose/ps.go
View File

@ -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)) 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")
} }

38
local/compose/ps.go
View File

@ -23,6 +23,7 @@ import (
moby "github.com/docker/docker/api/types" moby "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"golang.org/x/sync/errgroup"
"github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/compose"
) )
@ -38,10 +39,14 @@ func (s *composeService) Ps(ctx context.Context, projectName string, options com
return nil, err return nil, err
} }
var summary []compose.ContainerSummary summary := make([]compose.ContainerSummary, len(containers))
for _, c := range containers { eg, ctx := errgroup.WithContext(ctx)
for i, c := range containers {
container := c
i := i
eg.Go(func() error {
var publishers []compose.PortPublisher var publishers []compose.PortPublisher
for _, p := range c.Ports { for _, p := range container.Ports {
var url string var url string
if p.PublicPort != 0 { if p.PublicPort != 0 {
url = fmt.Sprintf("%s:%d", p.IP, p.PublicPort) url = fmt.Sprintf("%s:%d", p.IP, p.PublicPort)
@ -54,16 +59,29 @@ func (s *composeService) Ps(ctx context.Context, projectName string, options com
}) })
} }
summary = append(summary, compose.ContainerSummary{ inspect, err := s.apiClient.ContainerInspect(ctx, container.ID)
ID: c.ID, if err != nil {
Name: getCanonicalContainerName(c), return err
Project: c.Labels[projectLabel], }
Service: c.Labels[serviceLabel],
State: c.State, 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, Publishers: publishers,
}
return nil
}) })
} }
return summary, nil return summary, eg.Wait()
} }
func groupContainerByLabel(containers []moby.Container, labelName string) (map[string][]moby.Container, []string, error) { func groupContainerByLabel(containers []moby.Container, labelName string) (map[string][]moby.Container, []string, error) {