Browse Source

Merge pull request #17524 from mountkin/fix-teardown

dont try to remove builtin networks in teardown
Brian Goff 9 years ago
parent
commit
cccb6bce7d
1 changed files with 10 additions and 9 deletions
  1. 10 9
      integration-cli/docker_utils.go

+ 10 - 9
integration-cli/docker_utils.go

@@ -598,15 +598,16 @@ func deleteAllNetworks() error {
 	}
 	var errors []string
 	for _, n := range networks {
-		if n.Name != "bridge" {
-			status, b, err := sockRequest("DELETE", "/networks/"+n.Name, nil)
-			if err != nil {
-				errors = append(errors, err.Error())
-				continue
-			}
-			if status != http.StatusNoContent {
-				errors = append(errors, fmt.Sprintf("error deleting network %s: %s", n.Name, string(b)))
-			}
+		if n.Name == "bridge" || n.Name == "none" || n.Name == "host" {
+			continue
+		}
+		status, b, err := sockRequest("DELETE", "/networks/"+n.Name, nil)
+		if err != nil {
+			errors = append(errors, err.Error())
+			continue
+		}
+		if status != http.StatusNoContent {
+			errors = append(errors, fmt.Sprintf("error deleting network %s: %s", n.Name, string(b)))
 		}
 	}
 	if len(errors) > 0 {