diff options
author | baude <bbaude@redhat.com> | 2019-12-11 09:16:55 -0600 |
---|---|---|
committer | baude <bbaude@redhat.com> | 2019-12-11 09:21:24 -0600 |
commit | a332825ff58de514dd226de58885aa32a778be4f (patch) | |
tree | cd67994ff19ff038a78c0d710dee3a14bc02bae1 /pkg/adapter/containers.go | |
parent | a18de10499702495e4108b1c6f7abb244018b8f1 (diff) | |
download | podman-a332825ff58de514dd226de58885aa32a778be4f.tar.gz podman-a332825ff58de514dd226de58885aa32a778be4f.tar.bz2 podman-a332825ff58de514dd226de58885aa32a778be4f.zip |
allow exec to read files of environment variables
we want the ability to define environment variables in files for the
exec command.
Fixes: #1782408
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/adapter/containers.go')
-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") } |