containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rootless: use the slirp4netns builtin DNS first 

When using slirp4netns, be sure the built-in DNS server is the first
one to be used.

Closes: https://github.com/containers/libpod/issues/3277

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2019-06-12 10:29:54 +02:00
parent d4681fafe5
commit 0e34d9093e
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/container_internal_linux.go
View File

@ -1000,7 +1000,7 @@ func (c *Container) generateResolvConf() (string, error) {
nameservers := resolvconf.GetNameservers(resolv.Content) nameservers := resolvconf.GetNameservers(resolv.Content)
// slirp4netns has a built in DNS server. // slirp4netns has a built in DNS server.
if c.config.NetMode.IsSlirp4netns() { if c.config.NetMode.IsSlirp4netns() {
nameservers = append(nameservers, "10.0.2.3") nameservers = append([]string{"10.0.2.3"}, nameservers...)
} }
if len(c.config.DNSServer) > 0 { if len(c.config.DNSServer) > 0 {
// We store DNS servers as net.IP, so need to convert to string // We store DNS servers as net.IP, so need to convert to string