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

- reverse host field order (ip goes first)

Browse Source 
- fix host string split to permit IPv6

Signed-off-by: Nathan Williams <nath.e.will@gmail.com>

Closes: #635
Approved by: rhatdan
This commit is contained in:
Nathan Williams
2018-04-17 16:02:37 -07:00
committed by Atomic Bot
parent 96d11622c6
commit 94f20cdd00
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/container_internal.go
View File

@ -901,8 +901,8 @@ func (c *Container) generateHosts() (string, error) {
if len(c.config.HostAdd) > 0 { if len(c.config.HostAdd) > 0 {
for _, host := range c.config.HostAdd { for _, host := range c.config.HostAdd {
// the host format has already been verified at this point // the host format has already been verified at this point
fields := strings.Split(host, ":") fields := strings.SplitN(host, ":", 2)
hosts += fmt.Sprintf("%s %s\n", fields[0], fields[1]) hosts += fmt.Sprintf("%s %s\n", fields[1], fields[0])
} }
} }
return c.writeStringToRundir("hosts", hosts) return c.writeStringToRundir("hosts", hosts)

5
test/e2e/run_dns_test.go
View File

@ -62,10 +62,11 @@ var _ = Describe("Podman run dns", func() {
}) })
It("podman run add host", func() { It("podman run add host", func() {
session := podmanTest.Podman([]string{"run", "--add-host=foobar:1.1.1.1", ALPINE, "cat", "/etc/hosts"}) session := podmanTest.Podman([]string{"run", "--add-host=foobar:1.1.1.1", "--add-host=foobaz:dead:beef:cafe", ALPINE, "cat", "/etc/hosts"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
session.LineInOuputStartsWith("foobar 1.1.1.1") session.LineInOuputStartsWith("1.1.1.1 foobar")
session.LineInOuputStartsWith("dead:beef:cafe foobaz")
}) })
It("podman run add hostname", func() { It("podman run add hostname", func() {