Browse Source

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
Guillaume Lours 2 years ago
parent
commit
dcbd68a102
1 changed files with 1 additions and 1 deletions
  1. 1 1
      pkg/compose/down.go

+ 1 - 1
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
 			}