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

Merge pull request #8101 from mheon/net_none_hostname

Browse Source 
Add hostname to /etc/hosts for --net=none
This commit is contained in:
OpenShift Merge Robot
2020-10-22 11:25:27 -04:00
committed by GitHub
parent 2cb12bbc5a 0864d82cb5
commit d340f8523c
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libpod/container_internal_linux.go
View File

@ -1550,9 +1550,13 @@ func (c *Container) getHosts() string {
hosts += fmt.Sprintf("# used by slirp4netns\n%s\t%s %s\n", "10.0.2.100", c.Hostname(), c.config.Name) hosts += fmt.Sprintf("# used by slirp4netns\n%s\t%s %s\n", "10.0.2.100", c.Hostname(), c.config.Name)
} else { } else {
hasNetNS := false hasNetNS := false
netNone := false
for _, ns := range c.config.Spec.Linux.Namespaces { for _, ns := range c.config.Spec.Linux.Namespaces {
if ns.Type == spec.NetworkNamespace { if ns.Type == spec.NetworkNamespace {
hasNetNS = true hasNetNS = true
if ns.Path == "" && !c.config.CreateNetNS {
netNone = true
}
break break
} }
} }
@ -1564,6 +1568,9 @@ func (c *Container) getHosts() string {
} }
hosts += fmt.Sprintf("127.0.1.1 %s\n", osHostname) hosts += fmt.Sprintf("127.0.1.1 %s\n", osHostname)
} }
if netNone {
hosts += fmt.Sprintf("127.0.1.1 %s\n", c.Hostname())
}
} }
} }
return hosts return hosts

10
test/e2e/run_networking_test.go
View File

@ -584,6 +584,14 @@ var _ = Describe("Podman run networking", func() {
run := podmanTest.Podman([]string{"run", "--net=host", "--hostname", hostname, ALPINE, "hostname"}) run := podmanTest.Podman([]string{"run", "--net=host", "--hostname", hostname, ALPINE, "hostname"})
run.WaitWithDefaultTimeout() run.WaitWithDefaultTimeout()
Expect(run.ExitCode()).To(BeZero()) Expect(run.ExitCode()).To(BeZero())
Expect(strings.Contains(run.OutputToString(), "testctr")).To(BeTrue()) Expect(strings.Contains(run.OutputToString(), hostname)).To(BeTrue())
})
It("podman run with --net=none adds hostname to /etc/hosts", func() {
hostname := "testctr"
run := podmanTest.Podman([]string{"run", "--net=none", "--hostname", hostname, ALPINE, "hostname"})
run.WaitWithDefaultTimeout()
Expect(run.ExitCode()).To(BeZero())
Expect(strings.Contains(run.OutputToString(), hostname)).To(BeTrue())
}) })
}) })