diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-01-21 14:59:39 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-01-22 08:08:26 +0100 |
| commit | 5e65f0ba30f3fca73f8c207825632afef08378c1 (patch) | |
| tree | e9236d523b5c333d97125c0c8071fe751f90996f /pkg/rootlessport/rootlessport_linux.go | |
| parent | 37319dec1771aaa9764c81359f439e862f45d8e1 (diff) | |
| download | podman-5e65f0ba30f3fca73f8c207825632afef08378c1.tar.gz podman-5e65f0ba30f3fca73f8c207825632afef08378c1.tar.bz2 podman-5e65f0ba30f3fca73f8c207825632afef08378c1.zip | |
rootlessport: set source IP to slirp4netns device
set the source IP to the slirp4netns address instead of 127.0.0.1 when
using rootlesskit.
Closes: https://github.com/containers/podman/issues/5138
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg/rootlessport/rootlessport_linux.go')
| -rw-r--r-- | pkg/rootlessport/rootlessport_linux.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/rootlessport/rootlessport_linux.go b/pkg/rootlessport/rootlessport_linux.go index c686d80fc..80e1309a5 100644 --- a/pkg/rootlessport/rootlessport_linux.go +++ b/pkg/rootlessport/rootlessport_linux.go @@ -48,6 +48,7 @@ type Config struct { ExitFD int ReadyFD int TmpDir string + ChildIP string } func init() { @@ -227,7 +228,7 @@ outer: // let parent expose ports logrus.Infof("exposing ports %v", cfg.Mappings) - if err := exposePorts(driver, cfg.Mappings); err != nil { + if err := exposePorts(driver, cfg.Mappings, cfg.ChildIP); err != nil { return err } @@ -248,7 +249,7 @@ outer: return nil } -func exposePorts(pm rkport.Manager, portMappings []ocicni.PortMapping) error { +func exposePorts(pm rkport.Manager, portMappings []ocicni.PortMapping, childIP string) error { ctx := context.TODO() for _, i := range portMappings { hostIP := i.HostIP @@ -260,6 +261,7 @@ func exposePorts(pm rkport.Manager, portMappings []ocicni.PortMapping) error { ParentIP: hostIP, ParentPort: int(i.HostPort), ChildPort: int(i.ContainerPort), + ChildIP: childIP, } if err := rkportutil.ValidatePortSpec(spec, nil); err != nil { return err |