Merge pull request #1628 from zhsj/bpo-containerd-5024-5054

mikebrow · web-flow · commit aa2d5a97cdc4 · 2021-03-02T10:03:10.000-06:00
[release/1.4] append envs from image config to empty slice to avoid env lost

ok to merge issue with CI test is non-related
diff --git a/pkg/server/container_create_unix.go b/pkg/server/container_create_unix.go
@@ -147,7 +147,7 @@ func (c *criService) containerSpec(id string, sandboxID string, sandboxPid uint3
 
 	// Apply envs from image config first, so that envs from container config
 	// can override them.
-	env := imageConfig.Env
+	env := append([]string{}, imageConfig.Env...)
 	for _, e := range config.GetEnvs() {
 		env = append(env, e.GetKey()+"="+e.GetValue())
 	}
diff --git a/pkg/server/container_create_windows.go b/pkg/server/container_create_windows.go
@@ -52,7 +52,7 @@ func (c *criService) containerSpec(id string, sandboxID string, sandboxPid uint3
 
 	// Apply envs from image config first, so that envs from container config
 	// can override them.
-	env := imageConfig.Env
+	env := append([]string{}, imageConfig.Env...)
 	for _, e := range config.GetEnvs() {
 		env = append(env, e.GetKey()+"="+e.GetValue())
 	}

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ func (c *criService) containerSpec(id string, sandboxID string, sandboxPid uint3`
`147`	`147`
`148`	`148`	`// Apply envs from image config first, so that envs from container config`
`149`	`149`	`// can override them.`
`150`		`- env := imageConfig.Env`
	`150`	`+ env := append([]string{}, imageConfig.Env...)`
`151`	`151`	`for _, e := range config.GetEnvs() {`
`152`	`152`	`env = append(env, e.GetKey()+"="+e.GetValue())`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func (c *criService) containerSpec(id string, sandboxID string, sandboxPid uint3`
`52`	`52`
`53`	`53`	`// Apply envs from image config first, so that envs from container config`
`54`	`54`	`// can override them.`
`55`		`- env := imageConfig.Env`
	`55`	`+ env := append([]string{}, imageConfig.Env...)`
`56`	`56`	`for _, e := range config.GetEnvs() {`
`57`	`57`	`env = append(env, e.GetKey()+"="+e.GetValue())`
`58`	`58`	`}`