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
This commit is contained in:
commit
dcbd68a102
@ -274,7 +274,7 @@ func (s *composeService) removeContainers(ctx context.Context, w progress.Writer
|
|||||||
Force: true,
|
Force: true,
|
||||||
RemoveVolumes: volumes,
|
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"))
|
w.Event(progress.ErrorMessageEvent(eventName, "Error while Removing"))
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user