diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-21 08:05:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-21 08:05:38 -0500 |
| commit | d224a0f8ac4978c3ac399a0940f785892d63daa8 (patch) | |
| tree | edbac426dffcba771617b21bc390fb61675cba31 /libpod | |
| parent | a88ea2c68b1ef01077a53b1c568b85667dcbc1e2 (diff) | |
| parent | db4d15e852c574a2f2f4039cfef4814982776544 (diff) | |
| download | podman-d224a0f8ac4978c3ac399a0940f785892d63daa8.tar.gz podman-d224a0f8ac4978c3ac399a0940f785892d63daa8.tar.bz2 podman-d224a0f8ac4978c3ac399a0940f785892d63daa8.zip | |
Merge pull request #12918 from dgibson/propagate-conf-env
Propagate CONTAINERS_CONF to conmon
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 268a301fb..a328f7621 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -1318,6 +1318,10 @@ func (r *ConmonOCIRuntime) configureConmonEnv(ctr *Container, runtimeDir string) env = append(env, e) } } + conf, ok := os.LookupEnv("CONTAINERS_CONF") + if ok { + env = append(env, fmt.Sprintf("CONTAINERS_CONF=%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"))) |