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

Merge pull request #3305 from giuseppe/slirp-dns-first

Browse Source 
rootless: use the slirp4netns builtin DNS first
This commit is contained in:
OpenShift Merge Robot
2019-06-12 16:30:34 +02:00
committed by GitHub
parent 9faff31421 0e34d9093e
commit 77d1cf0a32
1 changed files with 1 additions and 1 deletions
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)
// slirp4netns has a built in DNS server.
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 {
// We store DNS servers as net.IP, so need to convert to string