Browse code

Merge pull request #17524 from mountkin/fix-teardown

dont try to remove builtin networks in teardown

Brian Goff authored on 2015/10/31 09:59:57
Showing 1 changed files
... ...
@@ -598,15 +598,16 @@ func deleteAllNetworks() error {
598 598
 	}
599 599
 	var errors []string
600 600
 	for _, n := range networks {
601
-		if n.Name != "bridge" {
602
-			status, b, err := sockRequest("DELETE", "/networks/"+n.Name, nil)
603
-			if err != nil {
604
-				errors = append(errors, err.Error())
605
-				continue
606
-			}
607
-			if status != http.StatusNoContent {
608
-				errors = append(errors, fmt.Sprintf("error deleting network %s: %s", n.Name, string(b)))
609
-			}
601
+		if n.Name == "bridge" || n.Name == "none" || n.Name == "host" {
602
+			continue
603
+		}
604
+		status, b, err := sockRequest("DELETE", "/networks/"+n.Name, nil)
605
+		if err != nil {
606
+			errors = append(errors, err.Error())
607
+			continue
608
+		}
609
+		if status != http.StatusNoContent {
610
+			errors = append(errors, fmt.Sprintf("error deleting network %s: %s", n.Name, string(b)))
610 611
 		}
611 612
 	}
612 613
 	if len(errors) > 0 {