Merge pull request #10136 from gtardif/fix_race_delete_orphan_containers

Ignore not only auto-removed containers but also "removal in progress" for orphan containers
docker · Jan 3, 2023 · dcbd68a · dcbd68a
2 parents a224780 + 37d15d7
commit dcbd68a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/compose/down.go b/pkg/compose/down.go
@@ -274,7 +274,7 @@ func (s *composeService) removeContainers(ctx context.Context, w progress.Writer
 				Force:         true,
 				RemoveVolumes: volumes,
 			})
-			if err != nil && !errdefs.IsNotFound(err) {
+			if err != nil && !errdefs.IsNotFound(err) && !errdefs.IsConflict(err) {
 				w.Event(progress.ErrorMessageEvent(eventName, "Error while Removing"))
 				return err
 			}