opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 08:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6550 from giuseppe/fix-userns-in-pod

Browse Source 
container: fix creating a userns inside of a pod
This commit is contained in:
OpenShift Merge Robot
2020-06-10 13:22:33 -04:00
committed by GitHub
parent c44992827d 6c27e27b8c
commit b2200dbe05
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libpod/container_internal_linux.go
View File

@ -392,7 +392,7 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) {
} }
for _, i := range c.config.Spec.Linux.Namespaces { for _, i := range c.config.Spec.Linux.Namespaces {
if i.Type == spec.UTSNamespace { if i.Type == spec.UTSNamespace && i.Path == "" {
hostname := c.Hostname() hostname := c.Hostname()
g.SetHostname(hostname) g.SetHostname(hostname)
g.AddProcessEnv("HOSTNAME", hostname) g.AddProcessEnv("HOSTNAME", hostname)
@ -591,7 +591,8 @@ func (c *Container) addNamespaceContainer(g *generate.Generator, ns LinuxNS, ctr
if specNS == spec.UTSNamespace { if specNS == spec.UTSNamespace {
hostname := nsCtr.Hostname() hostname := nsCtr.Hostname()
g.SetHostname(hostname) // Joining an existing namespace, cannot set the hostname
g.SetHostname("")
g.AddProcessEnv("HOSTNAME", hostname) g.AddProcessEnv("HOSTNAME", hostname)
} }
@ -1171,6 +1172,15 @@ func (c *Container) makeBindMounts() error {
// finally, save it in the new container // finally, save it in the new container
c.state.BindMounts["/etc/hosts"] = hostsPath 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 { } else {
if !c.config.UseImageResolvConf { if !c.config.UseImageResolvConf {
newResolv, err := c.generateResolvConf() newResolv, err := c.generateResolvConf()