diff options
author | baude <bbaude@redhat.com> | 2018-12-06 13:56:57 -0600 |
---|---|---|
committer | baude <bbaude@redhat.com> | 2018-12-06 13:56:57 -0600 |
commit | 39a036e24d026b62e49ce7ba00de8bafd38cd953 (patch) | |
tree | e626187c00ff9f5b16ca660e213b7c34d0739f22 /libpod/container.go | |
parent | 5c6e02b55be974f08e3b1e895046a3cf167fd3f7 (diff) | |
download | podman-39a036e24d026b62e49ce7ba00de8bafd38cd953.tar.gz podman-39a036e24d026b62e49ce7ba00de8bafd38cd953.tar.bz2 podman-39a036e24d026b62e49ce7ba00de8bafd38cd953.zip |
bind mount /etc/resolv.conf|hosts in pods
containers inside pods need to make sure they get /etc/resolv.conf
and /etc/hosts bind mounted when network is expected
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'libpod/container.go')
-rw-r--r-- | libpod/container.go | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/libpod/container.go b/libpod/container.go index b6155a809..b5346e581 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -1001,13 +1001,28 @@ func (c *Container) IsReadOnly() bool { } // NetworkDisabled returns whether the container is running with a disabled network -func (c *Container) NetworkDisabled() bool { +func (c *Container) NetworkDisabled() (bool, error) { + if c.config.NetNsCtr != "" { + container, err := c.runtime.LookupContainer(c.config.NetNsCtr) + if err != nil { + return false, err + } + return networkDisabled(container) + } + return networkDisabled(c) + +} + +func networkDisabled(c *Container) (bool, error) { + if c.config.CreateNetNS { + return false, nil + } if !c.config.PostConfigureNetNS { for _, ns := range c.config.Spec.Linux.Namespaces { if ns.Type == spec.NetworkNamespace { - return ns.Path == "" + return ns.Path == "", nil } } } - return false + return false, nil } |