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

zhsj · zhsj · commit f9bcbb7329a4 · 2021-02-27T01:48:13.000+08:00
Signed-off-by: Yadong Zhang <yadzhang@gmail.com> (cherry picked from commit containerd/containerd@08318b1) Signed-off-by: Shengjing Zhu <zhsj@debian.org>
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())
 	}

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`	`}`