Merge pull request #18371 from sallyom/dontReturnNonError

don't return error if can't delete non-existing container
Upstream-commit: aa2ca5d93c2b30ba13ff67820a49d6f570323576
Component: engine

components/engine/integration-cli/docker_utils.go

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