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-20 12:16:53 -0400 |
| commit | 23348e7f313a570c513772a88db7f2741c8242ba (patch) | |
| tree | 533378923a35ce3d92119b96adce2cf77a5b32ef /cmd | |
| parent | dbcb6f5892852ecf846faeef10d9b0237c472f99 (diff) | |
| download | podman-23348e7f313a570c513772a88db7f2741c8242ba.tar.gz podman-23348e7f313a570c513772a88db7f2741c8242ba.tar.bz2 podman-23348e7f313a570c513772a88db7f2741c8242ba.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 'cmd')
| -rw-r--r-- | cmd/podman/common/specgen.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index 48a2069ff..2074ed4fa 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -308,9 +308,8 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string // // Precedence order (higher index wins): // 1) env-host, 2) image data, 3) env-file, 4) env - env := map[string]string{ - "container": "podman", - } + env := make(map[string]string) + env["container"] = "podman" // First transform the os env into a map. We need it for the labels later in // any case. |