summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-12 16:30:34 +0200
committerGitHub <noreply@github.com>2019-06-12 16:30:34 +0200
commit77d1cf0a3288da0459c92790a0c2dddf8a68242e (patch)
treeefc7fc107bf3a78467a36f4eb61fc6a2c728a16a
parent9faff314218a4d8074a40349a262535a84c4fbab (diff)
parent0e34d9093e92aea1a1ba2cd360246c8e938e5374 (diff)
downloadpodman-77d1cf0a3288da0459c92790a0c2dddf8a68242e.tar.gz
podman-77d1cf0a3288da0459c92790a0c2dddf8a68242e.tar.bz2
podman-77d1cf0a3288da0459c92790a0c2dddf8a68242e.zip
Merge pull request #3305 from giuseppe/slirp-dns-first
rootless: use the slirp4netns builtin DNS first
-rw-r--r--libpod/container_internal_linux.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 4acc77afa..0be5427d9 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -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