diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-04-28 16:10:29 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-04-29 16:09:07 -0400 |
| commit | cc4a1ea8d3fc6cc9c4697acd52c7f1d9e0b51d2a (patch) | |
| tree | 3319a508ee581d74ffa9a8df77c4da735768ab13 /pkg | |
| parent | f44f830e9f3ac40b1aa28d4bd64eeebf3aca6237 (diff) | |
| download | podman-cc4a1ea8d3fc6cc9c4697acd52c7f1d9e0b51d2a.tar.gz podman-cc4a1ea8d3fc6cc9c4697acd52c7f1d9e0b51d2a.tar.bz2 podman-cc4a1ea8d3fc6cc9c4697acd52c7f1d9e0b51d2a.zip | |
User specified environment after other environments are set
Users can not currently override the environment variables set by
--http-proxy
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/spec/spec.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index 5de07fc28..c9a068578 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -326,10 +326,6 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM } defaultEnv = env.Join(env.DefaultEnvVariables, defaultEnv) } - config.Env = env.Join(defaultEnv, config.Env) - for name, val := range config.Env { - g.AddProcessEnv(name, val) - } if err := addRlimits(config, &g); err != nil { return nil, err @@ -360,6 +356,11 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM if err := config.Cgroup.ConfigureGenerator(&g); err != nil { return nil, err } + + config.Env = env.Join(defaultEnv, config.Env) + for name, val := range config.Env { + g.AddProcessEnv(name, val) + } configSpec := g.Config // If the container image specifies an label with a |