From c818e1117c015b7a8f6ca18ce2b536745b72ce1e Mon Sep 17 00:00:00 2001 From: John Howard Date: Tue, 5 Apr 2016 19:29:43 -0700 Subject: [PATCH] Windows: integration-cli don't delete nat Signed-off-by: John Howard Upstream-commit: d6ab2ad36d8c184bd7ea140df8b4894eff42b02d Component: engine --- components/engine/integration-cli/docker_utils.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/engine/integration-cli/docker_utils.go b/components/engine/integration-cli/docker_utils.go index a7a692a43b..2760ee806d 100644 --- a/components/engine/integration-cli/docker_utils.go +++ b/components/engine/integration-cli/docker_utils.go @@ -283,6 +283,10 @@ func deleteAllNetworks() error { if n.Name == "bridge" || n.Name == "none" || n.Name == "host" { 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) if err != nil { errors = append(errors, err.Error())