aboutsummaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-01 21:18:04 +0200
committerGitHub <noreply@github.com>2020-05-01 21:18:04 +0200
commite9b178556d89fa7d483826fbfb59e1075081f800 (patch)
tree692cd195e126997b226bcd857d10ee6c298e049c /pkg
parentb5af022859f680013083f184628dff184dc86c7a (diff)
parentcc4a1ea8d3fc6cc9c4697acd52c7f1d9e0b51d2a (diff)
downloadpodman-e9b178556d89fa7d483826fbfb59e1075081f800.tar.gz
podman-e9b178556d89fa7d483826fbfb59e1075081f800.tar.bz2
podman-e9b178556d89fa7d483826fbfb59e1075081f800.zip
Merge pull request #6028 from rhatdan/old
User specified environment after other environments are set
Diffstat (limited to 'pkg')
-rw-r--r--pkg/spec/spec.go9
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