From 6a1a4f97217b0a8635bc21fc86628f48bf8824d1 Mon Sep 17 00:00:00 2001 From: Simon Ferquel Date: Thu, 6 Sep 2018 11:54:23 +0200 Subject: [PATCH] Fix long startup on windows, with non-hns governed Hyper-V networks Similar to a related issue where previously, private Hyper-V networks would each add 15 secs to the daemon startup, non-hns governed internal networks are reported by hns as network type "internal" which is not mapped to any network plugin (and thus we get the same plugin load retry loop as before). This issue hits Docker for Desktop because we setup such a network for the Linux VM communication. Signed-off-by: Simon Ferquel --- daemon/daemon_windows.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/daemon/daemon_windows.go b/daemon/daemon_windows.go index 4f4537eb6e..04d3de9924 100644 --- a/daemon/daemon_windows.go +++ b/daemon/daemon_windows.go @@ -323,7 +323,8 @@ func (daemon *Daemon) initNetworkController(config *config.Config, activeSandbox // discover and add HNS networks to windows // network that exist are removed and added again for _, v := range hnsresponse { - if strings.ToLower(v.Type) == "private" { + networkTypeNorm := strings.ToLower(v.Type) + if networkTypeNorm == "private" || networkTypeNorm == "internal" { continue // workaround for HNS reporting unsupported networks } var n libnetwork.Network