diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-08 13:16:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 13:16:22 +0100 |
| commit | b33c774c159dbaed9824a0c596a94be1630f0170 (patch) | |
| tree | 57985f4d9fbc903610f31f3076011cd413d82fdf /libpod/oci_conmon_linux.go | |
| parent | c41fd09a8da3a96bc0e58f9f29f87b9bdf30264d (diff) | |
| parent | da7595a69fc15d131c9d8123d0a165bdde4232b6 (diff) | |
| download | podman-b33c774c159dbaed9824a0c596a94be1630f0170.tar.gz podman-b33c774c159dbaed9824a0c596a94be1630f0170.tar.bz2 podman-b33c774c159dbaed9824a0c596a94be1630f0170.zip | |
Merge pull request #4592 from AkihiroSuda/rootlesskit-port-forwarder
rootless: use RootlessKit port forwarder
Diffstat (limited to 'libpod/oci_conmon_linux.go')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 37aa71cbb..ef881802c 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -1000,6 +1000,15 @@ func (r *ConmonOCIRuntime) createOCIContainer(ctr *Container, restoreOptions *Co } // Leak one end in conmon, the other one will be leaked into slirp4netns cmd.ExtraFiles = append(cmd.ExtraFiles, ctr.rootlessSlirpSyncW) + + if ctr.rootlessPortSyncR != nil { + defer errorhandling.CloseQuiet(ctr.rootlessPortSyncR) + } + if ctr.rootlessPortSyncW != nil { + defer errorhandling.CloseQuiet(ctr.rootlessPortSyncW) + // Leak one end in conmon, the other one will be leaked into rootlessport + cmd.ExtraFiles = append(cmd.ExtraFiles, ctr.rootlessPortSyncW) + } } err = startCommandGivenSelinux(cmd) |