From 04ae160eca4a8bc134ca9abafa044191b893080b Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 10 Jan 2019 22:58:55 +0100 Subject: [PATCH] Fix: network=host using wrong resolv.conf with systemd-resolved When running a container in the host's network namespace, the container gets a copy of the host's resolv.conf (copied to `/etc/resolv.conf` inside the container). The current code always used the default (`/etc/resolv.conf`) path on the host, irregardless if `systemd-resolved` was used or not. This patch uses the correct file if `systemd-resolved` was detected to be running. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 8364d1c9d590d4266871cd820b76ef12e2b934ed) Signed-off-by: Sebastiaan van Stijn --- daemon/container_operations_unix.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go index 9953c7f3fddc5..c0aab72342692 100644 --- a/daemon/container_operations_unix.go +++ b/daemon/container_operations_unix.go @@ -375,11 +375,11 @@ func (daemon *Daemon) setupPathsAndSandboxOptions(container *container.Container if container.HostConfig.NetworkMode.IsHost() { // Point to the host files, so that will be copied into the container running in host mode *sboxOptions = append(*sboxOptions, libnetwork.OptionOriginHostsPath("/etc/hosts")) - *sboxOptions = append(*sboxOptions, libnetwork.OptionOriginResolvConfPath("/etc/resolv.conf")) - } else { - *sboxOptions = append(*sboxOptions, libnetwork.OptionOriginResolvConfPath(daemon.configStore.GetResolvConf())) } + // Copy the host's resolv.conf for the container (/etc/resolv.conf or /run/systemd/resolve/resolv.conf) + *sboxOptions = append(*sboxOptions, libnetwork.OptionOriginResolvConfPath(daemon.configStore.GetResolvConf())) + container.HostsPath, err = container.GetRootResourcePath("hosts") if err != nil { return err