Merge pull request #3542 from 1032120121/upstream_master

estesp · web-flow · commit 60439aeb1781 · 2019-08-16T10:15:32.000-04:00
bugfix: override image.Env with process.Env, rather than be contrary
diff --git a/oci/spec_opts.go b/oci/spec_opts.go
@@ -326,7 +326,7 @@ func WithImageConfigArgs(image Image, args []string) SpecOpts {
 
 		setProcess(s)
 		if s.Linux != nil {
-			s.Process.Env = replaceOrAppendEnvValues(s.Process.Env, config.Env)
+			s.Process.Env = replaceOrAppendEnvValues(config.Env, s.Process.Env)
 			cmd := config.Cmd
 			if len(args) > 0 {
 				cmd = args
@@ -348,7 +348,7 @@ func WithImageConfigArgs(image Image, args []string) SpecOpts {
 			// even if there is no specified user in the image config
 			return WithAdditionalGIDs("root")(ctx, client, c, s)
 		} else if s.Windows != nil {
-			s.Process.Env = replaceOrAppendEnvValues(s.Process.Env, config.Env)
+			s.Process.Env = replaceOrAppendEnvValues(config.Env, s.Process.Env)
 			cmd := config.Cmd
 			if len(args) > 0 {
 				cmd = args
diff --git a/oci/spec_opts_test.go b/oci/spec_opts_test.go
@@ -406,7 +406,7 @@ func TestWithImageConfigArgs(t *testing.T) {
 		WithImageConfigArgs(img, []string{"--boo", "bar"}),
 	}
 
-	expectedEnv := []string{"x=foo", "y=baz", "z=bar"}
+	expectedEnv := []string{"z=bar", "y=boo", "x=foo"}
 	expectedArgs := []string{"create", "--namespace=test", "--boo", "bar"}
 
 	for _, opt := range opts {

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ func TestWithImageConfigArgs(t *testing.T) {`
`406`	`406`	`WithImageConfigArgs(img, []string{"--boo", "bar"}),`
`407`	`407`	`}`
`408`	`408`
`409`		`- expectedEnv := []string{"x=foo", "y=baz", "z=bar"}`
	`409`	`+ expectedEnv := []string{"z=bar", "y=boo", "x=foo"}`
`410`	`410`	`expectedArgs := []string{"create", "--namespace=test", "--boo", "bar"}`
`411`	`411`
`412`	`412`	`for _, opt := range opts {`