Skip to content

Commit

Permalink
Ignore compose services not defined in current compose file
Browse files Browse the repository at this point in the history
  • Loading branch information
jsoriano committed Aug 13, 2019
1 parent d7c0323 commit 3b9f0fc
Showing 1 changed file with 25 additions and 2 deletions.
27 changes: 25 additions & 2 deletions libbeat/tests/compose/wrapper.go
Expand Up @@ -300,21 +300,44 @@ func (d *wrapperDriver) containers(ctx context.Context, projectFilter Filter, fi
}
}

serviceNames, err := d.serviceNames(ctx)
if err != nil {
return nil, errors.Wrap(err, "failed to get container list")
}

var containers []types.Container
for _, f := range serviceFilters {
c, err := d.client.ContainerList(ctx, types.ContainerListOptions{
list, err := d.client.ContainerList(ctx, types.ContainerListOptions{
All: true,
Filters: f,
})
if err != nil {
return nil, errors.Wrap(err, "failed to get container list")
}
containers = append(containers, c...)
for _, container := range list {
serviceName, ok := container.Labels[labelComposeService]
if !ok || !contains(serviceNames, serviceName) {
// Service is not defined in current docker compose file, ignore it
continue
}
containers = append(containers, container)
}
}

return containers, nil
}

func (d *wrapperDriver) serviceNames(ctx context.Context) ([]string, error) {
var stdout bytes.Buffer
cmd := d.cmd(ctx, "config", "--services")
cmd.Stdout = &stdout
err := cmd.Run()
if err != nil {
return nil, errors.Wrap(err, "failed to get list of service names")
}
return strings.Fields(stdout.String()), nil
}

func makeFilter(project, service string, projectFilter Filter) filters.Args {
f := filters.NewArgs()
f.Add("label", fmt.Sprintf("%s=%s", labelComposeProject, project))
Expand Down

0 comments on commit 3b9f0fc

Please sign in to comment.