Merge pull request #3551 from crosbymichael/default-env

dmcgowan · web-flow · commit c6da899e2fd5 · 2019-08-19T14:04:39.000-07:00
Remove the process default ENV
diff --git a/oci/spec.go b/oci/spec.go
@@ -141,7 +141,6 @@ func populateDefaultUnixSpec(ctx context.Context, s *Spec, id string) error {
 			Path: defaultRootfsPath,
 		},
 		Process: &specs.Process{
-			Env:             defaultUnixEnv,
 			Cwd:             "/",
 			NoNewPrivileges: true,
 			User: specs.User{
diff --git a/oci/spec_opts.go b/oci/spec_opts.go
@@ -151,6 +151,13 @@ func WithEnv(environmentVariables []string) SpecOpts {
 	}
 }
 
+// WithDefaultPathEnv sets the $PATH environment variable to the
+// default PATH defined in this package.
+func WithDefaultPathEnv(_ context.Context, _ Client, _ *containers.Container, s *Spec) error {
+	s.Process.Env = replaceOrAppendEnvValues(s.Process.Env, defaultUnixEnv)
+	return nil
+}
+
 // replaceOrAppendEnvValues returns the defaults with the overrides either
 // replaced by env key or appended to the list
 func replaceOrAppendEnvValues(defaults, overrides []string) []string {

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,13 @@ func WithEnv(environmentVariables []string) SpecOpts {`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
	`154`	`+// WithDefaultPathEnv sets the $PATH environment variable to the`
	`155`	`+// default PATH defined in this package.`
	`156`	`+func WithDefaultPathEnv(_ context.Context, _ Client, _ containers.Container, s Spec) error {`
	`157`	`+ s.Process.Env = replaceOrAppendEnvValues(s.Process.Env, defaultUnixEnv)`
	`158`	`+ return nil`
	`159`	`+}`
	`160`	`+`
`154`	`161`	`// replaceOrAppendEnvValues returns the defaults with the overrides either`
`155`	`162`	`// replaced by env key or appended to the list`
`156`	`163`	`func replaceOrAppendEnvValues(defaults, overrides []string) []string {`