From da99ad40d5530f93653a70fd9abaabff0676ca17 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Tue, 17 Nov 2020 15:13:36 +0100 Subject: [PATCH] Fix logs (concurrent access to container.ID, logs was displaying the first container logs for every container) Signed-off-by: Guillaume Tardif --- local/compose.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/local/compose.go b/local/compose.go index d63b262dc..3091d5f25 100644 --- a/local/compose.go +++ b/local/compose.go @@ -191,10 +191,11 @@ func (s *local) Logs(ctx context.Context, projectName string, w io.Writer) error consumer := formatter.NewLogConsumer(w) for _, c := range list { service := c.Labels["com.docker.compose.service"] + containerId := c.ID go func() { - s.containerService.Logs(ctx, c.ID, containers.LogsRequest{ + s.containerService.Logs(ctx,containerId, containers.LogsRequest{ Follow: true, - Writer: consumer.GetWriter(service, c.ID), + Writer: consumer.GetWriter(service, containerId), }) wg.Done() }() @@ -534,7 +535,6 @@ func (s *local) ensureNetwork(ctx context.Context, n types.NetworkConfig) error return nil } - func (s *local) ensureVolume(ctx context.Context, volume types.VolumeConfig) error { // TODO could identify volume by label vs name _, err := s.volumeService.Inspect(ctx, volume.Name)