Quellcode durchsuchen

Fix logs (concurrent access to container.ID, logs was displaying the first container logs for every container)

Signed-off-by: Guillaume Tardif <[email protected]>
Guillaume Tardif vor 5 Jahren
Ursprung
Commit
da99ad40d5
1 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
  1. 3 3
      local/compose.go

+ 3 - 3
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)