Merge pull request #3515 from crosbymichael/no-host-name-without-networking

Do not add hostname when networking is disabled
Upstream-commit: 42df36b6fcbf2397a35d37a59fbb50d69e27129e
Component: engine
This commit is contained in:
Guillaume J. Charmes
2014-01-08 17:22:24 -08:00

View File

@ -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...)
}