beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #21785 from Microsoft/jjh/nodeletenat

Browse source 
Windows: integration-cli don't delete nat
This commit is contained in:
Brian Goff 2016-04-06 10:20:58 -04:00
commit c760ea3d93
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
integration-cli/docker_utils.go
View file

@ -283,6 +283,10 @@ func deleteAllNetworks() error {
if n.Name == "bridge" || n.Name == "none" || n.Name == "host" { if n.Name == "bridge" || n.Name == "none" || n.Name == "host" {
continue continue
} }
if daemonPlatform == "windows" && strings.ToLower(n.Name) == "nat" {
// nat is a pre-defined network on Windows and cannot be removed
continue
}
status, b, err := sockRequest("DELETE", "/networks/"+n.Name, nil) status, b, err := sockRequest("DELETE", "/networks/"+n.Name, nil)
if err != nil { if err != nil {
errors = append(errors, err.Error()) errors = append(errors, err.Error())