зеркало из https://github.com/microsoft/docker.git
Merge pull request #18371 from sallyom/dontReturnNonError
don't return error if can't delete non-existing container
This commit is contained in:
Коммит
aa2ca5d93c
|
@ -627,8 +627,10 @@ func deleteAllContainers() error {
|
|||
return err
|
||||
}
|
||||
|
||||
if err = deleteContainer(containers); err != nil {
|
||||
return err
|
||||
if containers != "" {
|
||||
if err = deleteContainer(containers); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче