Don't exit on container destroy events

Fixes docker#8747 When the event is a container destroy, calling ContainerInspect returns an error, because the container no longer exists. This causes both `docker-compose up` and `docker-compose logs -f` to exit when removing a stopped container. This container has already emitted its die event, and has already been cleanup up. I believe all that needs doing in this case is to ignore the error. Another approach might be to check for the destroy event before calling ContainerInspect. Signed-off-by: Stephen Thirlwall <[email protected]>
sdt · Oct 31, 2021 · baa7ca9 · baa7ca9
1 parent 4cb6ace
commit baa7ca9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/compose/start.go b/pkg/compose/start.go
@@ -81,6 +81,11 @@ func (s *composeService) watchContainers(ctx context.Context, projectName string
 		Consumer: func(event api.Event) error {
 			inspected, err := s.apiClient.ContainerInspect(ctx, event.Container)
 			if err != nil {
+				if (event.Status == "destroy") {
+					// This container can't be inspected, because it's gone.
+					// Its already been removed from the watched map.
+					return nil
+				}
 				return err
 			}
 			container := moby.Container{