mirror of
https://github.com/containers/podman.git
synced 2025-06-23 18:59:30 +08:00
Merge pull request #2585 from giuseppe/build-honor-net
build: honor --net
This commit is contained in:
@ -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{}
|
||||
|
Reference in New Issue
Block a user