diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-20 13:25:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-20 13:25:37 +0100 |
| commit | 74b85098cf7f6e2809f9075475f4fae44c0f011c (patch) | |
| tree | 481b47153f0ca6a56af066393e221bd58349d8b3 /libpod/oci.go | |
| parent | 579fc0f7eb3928a076b0a5d1d6ec444205a0a930 (diff) | |
| parent | f182946bef84d2766c4ff9faef171cf69afacb97 (diff) | |
| download | podman-74b85098cf7f6e2809f9075475f4fae44c0f011c.tar.gz podman-74b85098cf7f6e2809f9075475f4fae44c0f011c.tar.bz2 podman-74b85098cf7f6e2809f9075475f4fae44c0f011c.zip | |
Merge pull request #2142 from giuseppe/expose-ports
rootless: support port redirection from the host
Diffstat (limited to 'libpod/oci.go')
| -rw-r--r-- | libpod/oci.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index 4092657f8..3451ddaa8 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -323,7 +323,7 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, cgroupParent string, res cmd.Env = append(cmd.Env, fmt.Sprintf("HOME=%s", os.Getenv("HOME"))) cmd.Env = append(cmd.Env, fmt.Sprintf("XDG_RUNTIME_DIR=%s", runtimeDir)) - if r.reservePorts { + if r.reservePorts && !ctr.config.NetMode.IsSlirp4netns() { ports, err := bindPorts(ctr.config.PortMappings) if err != nil { return err |