diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2020-07-31 13:52:14 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-08-18 15:17:46 -0400 |
| commit | a7e864e6e7de894d4edde4fff00e53dc6a0b5074 (patch) | |
| tree | 9a6381d9ce5ce0045ffa07dcfea2d10c725ab50d /pkg/spec | |
| parent | ff1f81b14a2944a1651e1b404681972ff3483d36 (diff) | |
| download | podman-a7e864e6e7de894d4edde4fff00e53dc6a0b5074.tar.gz podman-a7e864e6e7de894d4edde4fff00e53dc6a0b5074.tar.bz2 podman-a7e864e6e7de894d4edde4fff00e53dc6a0b5074.zip | |
Ensure DefaultEnvVariables is used in Specgen
When we rewrote Podman's pkg/spec, one of the things that was
lost was our use of a set of default environment variables, that
ensure all containers have at least $PATH and $TERM set.
While we're in the process of re-adding it, change it from a
variable to a function, so we can ensure the Join function does
not overwrite it and corrupt the defaults.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'pkg/spec')
| -rw-r--r-- | pkg/spec/spec.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index c7a838d4c..893ae3cab 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -321,13 +321,13 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM // config. var defaultEnv map[string]string if runtimeConfig == nil { - defaultEnv = env.DefaultEnvVariables + defaultEnv = env.DefaultEnvVariables() } else { defaultEnv, err = env.ParseSlice(runtimeConfig.Containers.Env) if err != nil { return nil, errors.Wrap(err, "Env fields in containers.conf failed ot parse") } - defaultEnv = env.Join(env.DefaultEnvVariables, defaultEnv) + defaultEnv = env.Join(env.DefaultEnvVariables(), defaultEnv) } if err := addRlimits(config, &g); err != nil { |