From 613224b496b3e2e23d026d3a05969692701d806c Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Mon, 16 Sep 2013 15:58:44 +0000 Subject: [PATCH] Don't show network related warnings when networking is disabled Upstream-commit: 40eaa82fc617a474b1325ac22bd1299d3c0e3d48 Component: engine --- components/engine/api.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/api.go b/components/engine/api.go index 3a2aadc33f..f75c2278f3 100644 --- a/components/engine/api.go +++ b/components/engine/api.go @@ -510,7 +510,7 @@ func postContainersCreate(srv *Server, version float64, w http.ResponseWriter, r return err } - if len(config.Dns) == 0 && len(srv.runtime.Dns) == 0 && utils.CheckLocalDns(resolvConf) { + if !config.NetworkDisabled && len(config.Dns) == 0 && len(srv.runtime.Dns) == 0 && utils.CheckLocalDns(resolvConf) { out.Warnings = append(out.Warnings, fmt.Sprintf("Docker detected local DNS server on resolv.conf. Using default external servers: %v", defaultDns)) config.Dns = defaultDns } @@ -530,7 +530,7 @@ func postContainersCreate(srv *Server, version float64, w http.ResponseWriter, r out.Warnings = append(out.Warnings, "Your kernel does not support memory swap capabilities. Limitation discarded.") } - if srv.runtime.capabilities.IPv4ForwardingDisabled { + if !config.NetworkDisabled && srv.runtime.capabilities.IPv4ForwardingDisabled { log.Println("Warning: IPv4 forwarding is disabled.") out.Warnings = append(out.Warnings, "IPv4 forwarding is disabled.") }