From 3cf480177fb1036ad0556340438f275395bf08f6 Mon Sep 17 00:00:00 2001 From: Alex Suraci Date: Sun, 30 Sep 2018 23:29:20 -0400 Subject: [PATCH] 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. --- cmd/in/main.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/in/main.go b/cmd/in/main.go index c1cef79..a537ed3 100644 --- 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