pick config or container_config, not both

ok, so container_config must be deprecated or something, 'cause the test image has both set. that explains that.
concourse · Oct 1, 2018 · 3cf4801 · 3cf4801
1 parent 3ed6ba7
commit 3cf4801
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/cmd/in/main.go b/cmd/in/main.go
@@ -130,7 +130,11 @@ func rootfsFormat(dest string, req InRequest, image v1.Image) {
 		return
 	}
 
-	env := append(cfg.Config.Env, cfg.ContainerConfig.Env...)
+	env := cfg.Config.Env
+	if len(env) == 0 {
+		env = cfg.ContainerConfig.Env
+	}
+
 	user := cfg.Config.User
 	if user == "" {
 		user = cfg.ContainerConfig.User