Merge pull request #5054 from jterry75/fix_env_windows

estesp · web-flow · commit e58be59cbded · 2021-02-18T20:40:44.000-05:00
cri: append envs from image config to empty slice to avoid env lost
diff --git a/pkg/cri/server/container_create_windows.go b/pkg/cri/server/container_create_windows.go
@@ -62,7 +62,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
`@@ -62,7 +62,7 @@ func (c *criService) containerSpec(`
`62`	`62`
`63`	`63`	`// Apply envs from image config first, so that envs from container config`
`64`	`64`	`// can override them.`
`65`		`- env := imageConfig.Env`
	`65`	`+ env := append([]string{}, imageConfig.Env...)`
`66`	`66`	`for _, e := range config.GetEnvs() {`
`67`	`67`	`env = append(env, e.GetKey()+"="+e.GetValue())`
`68`	`68`	`}`