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

[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
containerd · Mar 2, 2021 · aa2d5a9 · aa2d5a9
2 parents b4b894c + e4fcda3
commit aa2d5a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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())
 	}