Merge pull request #8726 from ndeloof/log_follow_killed

`log --follow` must stop when container get killed
docker · Oct 6, 2021 · 0062703 · 0062703
2 parents c55fde7 + 4af04b2
commit 0062703
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/compose/logs.go b/pkg/compose/logs.go
@@ -35,12 +35,16 @@ func (s *composeService) Logs(ctx context.Context, projectName string, consumer
 
 	eg, ctx := errgroup.WithContext(ctx)
 	if options.Follow {
+		printer := newLogPrinter(consumer)
 		eg.Go(func() error {
-			printer := newLogPrinter(consumer)
 			return s.watchContainers(ctx, projectName, options.Services, printer.HandleEvent, containers, func(c types.Container) error {
 				return s.logContainers(ctx, consumer, c, options)
 			})
 		})
+		eg.Go(func() error {
+			_, err := printer.Run(false, "", nil)
+			return err
+		})
 	}
 
 	for _, c := range containers {