github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #3542 from 1032120121/upstream_master

Browse Source 
bugfix: override image.Env with process.Env, rather than be contrary
This commit is contained in:
Phil Estes 2019-08-16 10:15:32 -04:00 committed by GitHub
commit 60439aeb17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oci/spec_opts.go
View File

@ -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

2
oci/spec_opts_test.go
View File

@ -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 {