Merge pull request #2358 from rhatdan/namespace

Fix up handling of user defined network namespaces

1 files changed, 17 insertions, 1 deletions

diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 3c0c5c3cf..f182b6bdf 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -757,8 +757,24 @@ func (c *Container) makeBindMounts() error {
 
 // generateResolvConf generates a containers resolv.conf
 func (c *Container) generateResolvConf() (string, error) {
+	resolvConf := "/etc/resolv.conf"
+	for _, ns := range c.config.Spec.Linux.Namespaces {
+		if ns.Type == spec.NetworkNamespace {
+			if ns.Path != "" && !strings.HasPrefix(ns.Path, "/proc/") {
+				definedPath := filepath.Join("/etc/netns", filepath.Base(ns.Path), "resolv.conf")
+				_, err := os.Stat(definedPath)
+				if err == nil {
+					resolvConf = definedPath
+				} else if !os.IsNotExist(err) {
+					return "", errors.Wrapf(err, "failed to stat %s", definedPath)
+				}
+			}
+			break
+		}
+	}
+
 	// Determine the endpoint for resolv.conf in case it is a symlink
-	resolvPath, err := filepath.EvalSymlinks("/etc/resolv.conf")
+	resolvPath, err := filepath.EvalSymlinks(resolvConf)
 	if err != nil {
 		return "", err
 	}