containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5381 from vrothberg/ENVFIX 

env: set "container" to current binary
This commit is contained in:
OpenShift Merge Robot 2020-03-04 13:26:48 -05:00 committed by GitHub
parent 4d012cb6db 6d2d6898f8
commit 797da2a57b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/podman/shared/create.go
View File

@ -477,7 +477,9 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod.
// //
// Precedence order (higher index wins): // Precedence order (higher index wins):
// 1) env-host, 2) image data, 3) env-file, 4) env // 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 // Start with env-host
if c.Bool("env-host") { if c.Bool("env-host") {
@ -485,7 +487,7 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod.
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error parsing host environment variables") return nil, errors.Wrap(err, "error parsing host environment variables")
} }
env = osEnv env = envLib.Join(env, osEnv)
} }
// Image data overrides any previous variables // Image data overrides any previous variables

7
pkg/env/env.go vendored
View File

@ -12,11 +12,10 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
) )
// DefaultEnvVariables set $PATH, $TERM and $container. // DefaultEnvVariables sets $PATH and $TERM.
var DefaultEnvVariables = map[string]string{ var DefaultEnvVariables = map[string]string{
"PATH": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "PATH": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
"TERM": "xterm", "TERM": "xterm",
"container": "podman",
} }
const whiteSpaces = " \t" const whiteSpaces = " \t"