cri: append envs from image config to empty slice to avoid env lost

zhsj · zhsj · commit e4fcda3215cc · 2021-02-27T01:49:43.000+08:00
Signed-off-by: Justin Terry (SF) <juterry@microsoft.com> (cherry picked from commit containerd/containerd@06e4e09) Signed-off-by: Shengjing Zhu <zhsj@debian.org>
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
`@@ -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`	`}`