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 <[email protected]>
containers · Apr 29, 2020 · cc4a1ea · cc4a1ea
1 parent f44f830
commit cc4a1ea
Showing 1 changed file with 5 additions and 4 deletions.
diff --git 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