diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-04 13:26:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 13:26:48 -0500 |
| commit | 797da2a57b43d1190dd1fb6ec78dcc9ec76c3bd3 (patch) | |
| tree | ad2c3bebdbca7587d9a7d58fdba03e91b2973def | |
| parent | 4d012cb6db61df28b455f0a906e1e73ac0055cc0 (diff) | |
| parent | 6d2d6898f8b31d9a3e15cf2d2923f098433d9a58 (diff) | |
| download | podman-797da2a57b43d1190dd1fb6ec78dcc9ec76c3bd3.tar.gz podman-797da2a57b43d1190dd1fb6ec78dcc9ec76c3bd3.tar.bz2 podman-797da2a57b43d1190dd1fb6ec78dcc9ec76c3bd3.zip | |
Merge pull request #5381 from vrothberg/ENVFIX
env: set "container" to current binary
| -rw-r--r-- | cmd/podman/shared/create.go | 6 | ||||
| -rw-r--r-- | pkg/env/env.go | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go index 0ce578bef..08d32df18 100644 --- a/cmd/podman/shared/create.go +++ b/cmd/podman/shared/create.go @@ -477,7 +477,9 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod. // // Precedence order (higher index wins): // 1) env-host, 2) image data, 3) env-file, 4) env - var env map[string]string + env := map[string]string{ + "container": "podman", + } // Start with env-host if c.Bool("env-host") { @@ -485,7 +487,7 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod. if err != nil { return nil, errors.Wrap(err, "error parsing host environment variables") } - env = osEnv + env = envLib.Join(env, osEnv) } // Image data overrides any previous variables diff --git a/pkg/env/env.go b/pkg/env/env.go index 9c0ee79db..c6a1a0d28 100644 --- a/pkg/env/env.go +++ b/pkg/env/env.go @@ -12,11 +12,10 @@ import ( "github.com/pkg/errors" ) -// DefaultEnvVariables set $PATH, $TERM and $container. +// DefaultEnvVariables sets $PATH and $TERM. var DefaultEnvVariables = map[string]string{ - "PATH": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", - "TERM": "xterm", - "container": "podman", + "PATH": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", + "TERM": "xterm", } const whiteSpaces = " \t" |