kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #17524 from mountkin/fix-teardown

Browse source 
dont try to remove builtin networks in teardown
This commit is contained in:
Brian Goff 2015-10-30 20:59:57 -04:00
commit cccb6bce7d
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
integration-cli/docker_utils.go
View file

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