diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-12 00:38:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-12 00:38:03 +0200 |
| commit | 940d3d889221e21cc24705381b2c2d11d75f39bf (patch) | |
| tree | 6ed96c2c7ed38d1e51f20b74cba61538cbcc0197 | |
| parent | b9cbc0c09a68be7bb55048a494753c77c08bfbd3 (diff) | |
| parent | 6091ff42dc8d177c49e1b09ecec5ca2bc7ff5513 (diff) | |
| download | podman-940d3d889221e21cc24705381b2c2d11d75f39bf.tar.gz podman-940d3d889221e21cc24705381b2c2d11d75f39bf.tar.bz2 podman-940d3d889221e21cc24705381b2c2d11d75f39bf.zip | |
Merge pull request #15734 from KenMacD/add-path
Include PATH in conmon env.
| -rw-r--r-- | libpod/oci_conmon_common.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libpod/oci_conmon_common.go b/libpod/oci_conmon_common.go index 0c61de360..8ef8ae721 100644 --- a/libpod/oci_conmon_common.go +++ b/libpod/oci_conmon_common.go @@ -1266,10 +1266,15 @@ func (r *ConmonOCIRuntime) configureConmonEnv(runtimeDir string) []string { env = append(env, e) } } - conf, ok := os.LookupEnv("CONTAINERS_CONF") - if ok { + if path, ok := os.LookupEnv("PATH"); ok { + env = append(env, fmt.Sprintf("PATH=%s", path)) + } + if conf, ok := os.LookupEnv("CONTAINERS_CONF"); ok { env = append(env, fmt.Sprintf("CONTAINERS_CONF=%s", conf)) } + if conf, ok := os.LookupEnv("CONTAINERS_HELPER_BINARY_DIR"); ok { + env = append(env, fmt.Sprintf("CONTAINERS_HELPER_BINARY_DIR=%s", conf)) + } env = append(env, fmt.Sprintf("XDG_RUNTIME_DIR=%s", runtimeDir)) env = append(env, fmt.Sprintf("_CONTAINERS_USERNS_CONFIGURED=%s", os.Getenv("_CONTAINERS_USERNS_CONFIGURED"))) env = append(env, fmt.Sprintf("_CONTAINERS_ROOTLESS_UID=%s", os.Getenv("_CONTAINERS_ROOTLESS_UID"))) |