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:
Guillaume Lours 2023-01-03 11:30:04 +01:00 committed by GitHub
commit dcbd68a102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -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
}