diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-22 05:07:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 05:07:15 -0500 |
| commit | f02aba659447ea9198851231d7f11a8bfdfe69ba (patch) | |
| tree | 0d22b1af8408cba9499da16e565cb7e48a845330 /libpod/container_internal_linux.go | |
| parent | 6fd83de31dab0c60932972c6b26f68fa0bd1871f (diff) | |
| parent | ef654941d1b7d3bd8f5af51418aa54e0d6f2d48c (diff) | |
| download | podman-f02aba659447ea9198851231d7f11a8bfdfe69ba.tar.gz podman-f02aba659447ea9198851231d7f11a8bfdfe69ba.tar.bz2 podman-f02aba659447ea9198851231d7f11a8bfdfe69ba.zip | |
Merge pull request #9052 from giuseppe/set-source-to-slirp4netns-ip
rootlessport: set source IP to slirp4netns device
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 0553cc59c..b41a3fa38 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -1700,7 +1700,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([]string{"10.0.2.3"}, nameservers...) + nameservers = append([]string{slirp4netnsDNS}, nameservers...) } } @@ -1780,7 +1780,7 @@ func (c *Container) getHosts() string { if c.Hostname() != "" { if c.config.NetMode.IsSlirp4netns() { // When using slirp4netns, the interface gets a static IP - hosts += fmt.Sprintf("# used by slirp4netns\n%s\t%s %s\n", "10.0.2.100", c.Hostname(), c.config.Name) + hosts += fmt.Sprintf("# used by slirp4netns\n%s\t%s %s\n", slirp4netnsIP, c.Hostname(), c.config.Name) } else { hasNetNS := false netNone := false |