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

Merge pull request #8067 from mheon/net_host_hosts

Browse Source 
Ensure that hostname is added to hosts with net=host
This commit is contained in:
OpenShift Merge Robot
2020-10-20 15:18:53 -04:00
committed by GitHub
parent 36682115b0 1b288a35ba
commit 6961b9475d
3 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libpod/container_internal_linux.go
View File

@ -1541,11 +1541,31 @@ func (c *Container) getHosts() string {
} }
} }
if c.config.NetMode.IsSlirp4netns() {
// When using slirp4netns, the interface gets a static IP
hosts += fmt.Sprintf("# used by slirp4netns\n%s\t%s %s\n", "10.0.2.100", c.Hostname(), c.Config().Name)
}
hosts += c.cniHosts() hosts += c.cniHosts()
// If not making a network namespace, add our own hostname.
if c.Hostname() != "" {
if c.config.NetMode.IsSlirp4netns() {
// When using slirp4netns, the interface gets a static IP
hosts += fmt.Sprintf("# used by slirp4netns\n%s\t%s %s\n", "10.0.2.100", c.Hostname(), c.config.Name)
} else {
hasNetNS := false
for _, ns := range c.config.Spec.Linux.Namespaces {
if ns.Type == spec.NetworkNamespace {
hasNetNS = true
break
}
}
if !hasNetNS {
// 127.0.1.1 and host's hostname to match Docker
osHostname, err := os.Hostname()
if err != nil {
osHostname = c.Hostname()
}
hosts += fmt.Sprintf("127.0.1.1 %s\n", osHostname)
}
}
}
return hosts return hosts
} }

2
pkg/specgen/generate/namespaces.go
View File

@ -342,7 +342,7 @@ func specConfigureNamespaces(s *specgen.SpecGenerator, g *generate.Generator, rt
return errors.Wrapf(err, "error looking up container to share uts namespace with") return errors.Wrapf(err, "error looking up container to share uts namespace with")
} }
hostname = utsCtr.Hostname() hostname = utsCtr.Hostname()
case s.NetNS.NSMode == specgen.Host || s.UtsNS.NSMode == specgen.Host: case (s.NetNS.NSMode == specgen.Host && hostname == "") || s.UtsNS.NSMode == specgen.Host:
tmpHostname, err := os.Hostname() tmpHostname, err := os.Hostname()
if err != nil { if err != nil {
return errors.Wrap(err, "unable to retrieve hostname of the host") return errors.Wrap(err, "unable to retrieve hostname of the host")

15
test/e2e/run_networking_test.go
View File

@ -571,4 +571,19 @@ var _ = Describe("Podman run networking", func() {
podrm.WaitWithDefaultTimeout() podrm.WaitWithDefaultTimeout()
Expect(podrm.ExitCode()).To(BeZero()) Expect(podrm.ExitCode()).To(BeZero())
}) })
It("podman run net=host adds entry to /etc/hosts", func() {
run := podmanTest.Podman([]string{"run", "--net=host", ALPINE, "cat", "/etc/hosts"})
run.WaitWithDefaultTimeout()
Expect(run.ExitCode()).To(BeZero())
Expect(strings.Contains(run.OutputToString(), "127.0.1.1")).To(BeTrue())
})
It("podman run with --net=host and --hostname sets correct hostname", func() {
hostname := "testctr"
run := podmanTest.Podman([]string{"run", "--net=host", "--hostname", hostname, ALPINE, "hostname"})
run.WaitWithDefaultTimeout()
Expect(run.ExitCode()).To(BeZero())
Expect(strings.Contains(run.OutputToString(), "testctr")).To(BeTrue())
})
}) })