From a7ff45c891204e2ca00bdec621c1f91b7951aa81 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Wed, 8 Jan 2014 16:57:56 -0800 Subject: [PATCH] Do not add hostname when networking is disabled Docker-DCO-1.0-Signed-off-by: Michael Crosby (github: crosbymichael) Upstream-commit: 0354c3a95cf1f95ac9564b8e2897295e8a8613fd Component: engine --- components/engine/container.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/container.go b/components/engine/container.go index 95f1fb99d4..cea316ae5c 100644 --- a/components/engine/container.go +++ b/components/engine/container.go @@ -1044,7 +1044,7 @@ ff02::2 ip6-allrouters if container.Config.Domainname != "" { hostsContent = append([]byte(fmt.Sprintf("%s\t%s.%s %s\n", IP, container.Config.Hostname, container.Config.Domainname, container.Config.Hostname)), hostsContent...) - } else { + } else if !container.Config.NetworkDisabled { hostsContent = append([]byte(fmt.Sprintf("%s\t%s\n", IP, container.Config.Hostname)), hostsContent...) }