diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-10 13:22:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 13:22:33 -0400 |
| commit | b2200dbe056ac409461033f646cdd25bcccea521 (patch) | |
| tree | b76af6eb8ef0c33ba008f20f428092dce4ee2c74 | |
| parent | c44992827d7e5d6ab84317a49340f34734c13ec5 (diff) | |
| parent | 6c27e27b8c263696c78d540a87918c6482507310 (diff) | |
| download | podman-b2200dbe056ac409461033f646cdd25bcccea521.tar.gz podman-b2200dbe056ac409461033f646cdd25bcccea521.tar.bz2 podman-b2200dbe056ac409461033f646cdd25bcccea521.zip | |
Merge pull request #6550 from giuseppe/fix-userns-in-pod
container: fix creating a userns inside of a pod
| -rw-r--r-- | libpod/container_internal_linux.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index d08e012a6..e3ca3f6b2 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -392,7 +392,7 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { } for _, i := range c.config.Spec.Linux.Namespaces { - if i.Type == spec.UTSNamespace { + if i.Type == spec.UTSNamespace && i.Path == "" { hostname := c.Hostname() g.SetHostname(hostname) g.AddProcessEnv("HOSTNAME", hostname) @@ -591,7 +591,8 @@ func (c *Container) addNamespaceContainer(g *generate.Generator, ns LinuxNS, ctr if specNS == spec.UTSNamespace { hostname := nsCtr.Hostname() - g.SetHostname(hostname) + // Joining an existing namespace, cannot set the hostname + g.SetHostname("") g.AddProcessEnv("HOSTNAME", hostname) } @@ -1171,6 +1172,15 @@ func (c *Container) makeBindMounts() error { // finally, save it in the new container c.state.BindMounts["/etc/hosts"] = hostsPath } + + if !hasCurrentUserMapped(c) { + if err := makeAccessible(resolvPath, c.RootUID(), c.RootGID()); err != nil { + return err + } + if err := makeAccessible(hostsPath, c.RootUID(), c.RootGID()); err != nil { + return err + } + } } else { if !c.config.UseImageResolvConf { newResolv, err := c.generateResolvConf() |