diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-08-31 14:46:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-31 14:46:10 -0400 |
| commit | f947ea2d5fc84ac579d4bb13a66fb699500da7f4 (patch) | |
| tree | 0b9db1b2da78eaf53ddfee4f973798eb8939bb72 /libpod/oci_conmon_exec_linux.go | |
| parent | 8ab84b437352bf2b3653fe92fbfa60a59b980a93 (diff) | |
| parent | 10144b707ece4533e332a18fbb6ae7ca23d771ac (diff) | |
| download | podman-f947ea2d5fc84ac579d4bb13a66fb699500da7f4.tar.gz podman-f947ea2d5fc84ac579d4bb13a66fb699500da7f4.tar.bz2 podman-f947ea2d5fc84ac579d4bb13a66fb699500da7f4.zip | |
Merge pull request #11316 from vrothberg/fix-10443
pass LISTEN_* environment into container
Diffstat (limited to 'libpod/oci_conmon_exec_linux.go')
| -rw-r--r-- | libpod/oci_conmon_exec_linux.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go index 469bc7d86..c4bae9b78 100644 --- a/libpod/oci_conmon_exec_linux.go +++ b/libpod/oci_conmon_exec_linux.go @@ -438,7 +438,7 @@ func (r *ConmonOCIRuntime) startExec(c *Container, sessionID string, options *Ex // } // } - conmonEnv, extraFiles := r.configureConmonEnv(c, runtimeDir) + conmonEnv := r.configureConmonEnv(c, runtimeDir) var filesToClose []*os.File if options.PreserveFDs > 0 { @@ -456,7 +456,6 @@ func (r *ConmonOCIRuntime) startExec(c *Container, sessionID string, options *Ex execCmd.Env = append(execCmd.Env, conmonEnv...) execCmd.ExtraFiles = append(execCmd.ExtraFiles, childSyncPipe, childStartPipe, childAttachPipe) - execCmd.ExtraFiles = append(execCmd.ExtraFiles, extraFiles...) execCmd.Dir = c.execBundlePath(sessionID) execCmd.SysProcAttr = &syscall.SysProcAttr{ Setpgid: true, |