Merge pull request #5024 from yadzhang/deepcopy-imageconfig

estesp · web-flow · commit c32ccdf8beff · 2021-02-18T12:51:51.000-05:00
cri: append envs from image config to empty slice to avoid env lost
diff --git a/pkg/cri/server/container_create_linux.go b/pkg/cri/server/container_create_linux.go
@@ -161,7 +161,7 @@ func (c *criService) containerSpec(
 
 	// 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
`@@ -161,7 +161,7 @@ func (c *criService) containerSpec(`
`161`	`161`
`162`	`162`	`// Apply envs from image config first, so that envs from container config`
`163`	`163`	`// can override them.`
`164`		`- env := imageConfig.Env`
	`164`	`+ env := append([]string{}, imageConfig.Env...)`
`165`	`165`	`for _, e := range config.GetEnvs() {`
`166`	`166`	`env = append(env, e.GetKey()+"="+e.GetValue())`
`167`	`167`	`}`