diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-11 21:22:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-11 21:22:59 +0100 |
| commit | f81f15f42250a642f0753b5f18be61c1f24931dd (patch) | |
| tree | fb3e64704caa95da765368b198bd834bc9e1c8df /pkg | |
| parent | 5941138fdd3d203a949871f47f1d63462a0f18e8 (diff) | |
| parent | a332825ff58de514dd226de58885aa32a778be4f (diff) | |
| download | podman-f81f15f42250a642f0753b5f18be61c1f24931dd.tar.gz podman-f81f15f42250a642f0753b5f18be61c1f24931dd.tar.bz2 podman-f81f15f42250a642f0753b5f18be61c1f24931dd.zip | |
Merge pull request #4677 from baude/execenvfile
allow exec to read files of environment variables
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/adapter/containers.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go index 6d139d0bf..3334e9fa1 100644 --- a/pkg/adapter/containers.go +++ b/pkg/adapter/containers.go @@ -1024,7 +1024,7 @@ func (r *LocalRuntime) ExecContainer(ctx context.Context, cli *cliconfig.ExecVal // Validate given environment variables env := map[string]string{} - if err := parse.ReadKVStrings(env, []string{}, cli.Env); err != nil { + if err := parse.ReadKVStrings(env, cli.EnvFile, cli.Env); err != nil { return ec, errors.Wrapf(err, "unable to process environment variables") } |