Ignore not only auto-removed containers but also "removal in progress" for orphan containers

gtardif · gtardif · commit 37d15d7e6bad · 2023-01-03T11:09:41.000+01:00
Signed-off-by: Guillaume Tardif &lt;guillaume.tardif@gmail.com&gt;
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
 			}

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ func (s *composeService) removeContainers(ctx context.Context, w progress.Writer`
`274`	`274`	`Force: true,`
`275`	`275`	`RemoveVolumes: volumes,`
`276`	`276`	`})`
`277`		`- if err != nil && !errdefs.IsNotFound(err) {`
	`277`	`+ if err != nil && !errdefs.IsNotFound(err) && !errdefs.IsConflict(err) {`
`278`	`278`	`w.Event(progress.ErrorMessageEvent(eventName, "Error while Removing"))`
`279`	`279`	`return err`
`280`	`280`	`}`