Merge pull request #2585 from giuseppe/build-honor-net

build: honor --net
This commit is contained in:
OpenShift Merge Robot
2019-03-12 12:19:47 -07:00
committed by GitHub
2 changed files with 32 additions and 0 deletions

View File

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