2 files changed, 20 insertions, 6 deletions
diff --git a/pkg/domain/infra/abi/network.go b/pkg/domain/infra/abi/network.go
index 807e4b272..053be6528 100644
--- a/pkg/domain/infra/abi/network.go
+++ b/pkg/domain/infra/abi/network.go
@@ -82,12 +82,21 @@ func (ic *ContainerEngine) NetworkRm(ctx context.Context, namesOrIds []string, o
 		// We need to iterate containers looking to see if they belong to the given network
 		for _, c := range containers {
 			if util.StringInSlice(name, c.Config().Networks) {
-				// if user passes force, we nuke containers
+				// if user passes force, we nuke containers and pods
 				if !options.Force {
 					// Without the force option, we return an error
-					return reports, errors.Errorf("%q has associated containers with it. Use -f to forcibly delete containers", name)
+					return reports, errors.Errorf("%q has associated containers with it. Use -f to forcibly delete containers and pods", name)
 				}
-				if err := ic.Libpod.RemoveContainer(ctx, c, true, true); err != nil {
+				if c.IsInfra() {
+					// if we have a infra container we need to remove the pod
+					pod, err := ic.Libpod.GetPod(c.PodID())
+					if err != nil {
+						return reports, err
+					}
+					if err := ic.Libpod.RemovePod(ctx, pod, true, true); err != nil {
+						return reports, err
+					}
+				} else if err := ic.Libpod.RemoveContainer(ctx, c, true, true); err != nil {
 					return reports, err
 				}
 			}
diff --git a/pkg/domain/infra/tunnel/network.go b/pkg/domain/infra/tunnel/network.go
index 074425087..d155fdd9e 100644
--- a/pkg/domain/infra/tunnel/network.go
+++ b/pkg/domain/infra/tunnel/network.go
@@ -26,11 +26,16 @@ func (ic *ContainerEngine) NetworkInspect(ctx context.Context, namesOrIds []stri
 func (ic *ContainerEngine) NetworkRm(ctx context.Context, namesOrIds []string, options entities.NetworkRmOptions) ([]*entities.NetworkRmReport, error) {
 	reports := make([]*entities.NetworkRmReport, 0, len(namesOrIds))
 	for _, name := range namesOrIds {
-		report, err := network.Remove(ic.ClientCxt, name, &options.Force)
+		response, err := network.Remove(ic.ClientCxt, name, &options.Force)
 		if err != nil {
-			report[0].Err = err
+			report := &entities.NetworkRmReport{
+				Name: name,
+				Err:  err,
+			}
+			reports = append(reports, report)
+		} else {
+			reports = append(reports, response...)
 		}
-		reports = append(reports, report...)
 	}
 	return reports, nil
 }