summaryrefslogtreecommitdiff
path: root/libpod/networking_linux.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-02-18 21:19:00 +0100
committerGitHub <noreply@github.com>2020-02-18 21:19:00 +0100
commit3be1221aea406b38741598038532e43714619127 (patch)
tree33258bf1c8231627affadc722c5eb69e929843c6 /libpod/networking_linux.go
parent931eb1b58314d3385ab48601cb2cc3bd0c371196 (diff)
parent170fd7b038757228bf169e6180cab19a1e412f26 (diff)
downloadpodman-3be1221aea406b38741598038532e43714619127.tar.gz
podman-3be1221aea406b38741598038532e43714619127.tar.bz2
podman-3be1221aea406b38741598038532e43714619127.zip
Merge pull request #5245 from giuseppe/rootless-portmapping-detach
rootless: fix a regression when using -d
Diffstat (limited to 'libpod/networking_linux.go')
-rw-r--r--libpod/networking_linux.go14
1 files changed, 11 insertions, 3 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go
index d90bcb708..fa8593f20 100644
--- a/libpod/networking_linux.go
+++ b/libpod/networking_linux.go
@@ -335,10 +335,13 @@ func (r *Runtime) setupRootlessPortMapping(ctr *Container, netnsPath string) (er
return errors.Wrapf(err, "delete file %s", logPath)
}
- ctr.rootlessPortSyncR, ctr.rootlessPortSyncW, err = os.Pipe()
- if err != nil {
- return errors.Wrapf(err, "failed to create rootless port sync pipe")
+ if !ctr.config.PostConfigureNetNS {
+ ctr.rootlessPortSyncR, ctr.rootlessPortSyncW, err = os.Pipe()
+ if err != nil {
+ return errors.Wrapf(err, "failed to create rootless port sync pipe")
+ }
}
+
cfg := rootlessport.Config{
Mappings: ctr.config.PortMappings,
NetNSPath: netnsPath,
@@ -355,6 +358,11 @@ func (r *Runtime) setupRootlessPortMapping(ctr *Container, netnsPath string) (er
cmd := exec.Command(fmt.Sprintf("/proc/%d/exe", os.Getpid()))
cmd.Args = []string{rootlessport.ReexecKey}
// Leak one end of the pipe in rootlessport process, the other will be sent to conmon
+
+ if ctr.rootlessPortSyncR != nil {
+ defer errorhandling.CloseQuiet(ctr.rootlessPortSyncR)
+ }
+
cmd.ExtraFiles = append(cmd.ExtraFiles, ctr.rootlessPortSyncR, syncW)
cmd.Stdin = cfgR
// stdout is for human-readable error, stderr is for debug log