From 1b06de3136570b40324d20864de2eda1e287b865 Mon Sep 17 00:00:00 2001 From: Robin Winkelewski Date: Mon, 11 Dec 2017 18:42:06 +0100 Subject: [PATCH] fix inspect.Config usage Signed-off-by: Robin Winkelewski --- src/moby/config.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/moby/config.go b/src/moby/config.go index d4f57c8aa..59f7c0cc1 100644 --- a/src/moby/config.go +++ b/src/moby/config.go @@ -702,9 +702,9 @@ func ConfigInspectToOCI(yaml *Image, inspect types.ImageInspect, idMap map[strin oci := specs.Spec{} runtime := Runtime{} - var inspectConfig container.Config + inspectConfig := &container.Config{} if inspect.Config != nil { - inspectConfig = *inspect.Config + inspectConfig = inspect.Config } // look for org.mobyproject.config label @@ -721,7 +721,7 @@ func ConfigInspectToOCI(yaml *Image, inspect types.ImageInspect, idMap map[strin // command, env and cwd can be taken from image, as they are commonly specified in Dockerfile // TODO we could handle entrypoint and cmd independently more like Docker - inspectCommand := append(inspectConfig.Entrypoint, inspect.Config.Cmd...) + inspectCommand := append(inspectConfig.Entrypoint, inspectConfig.Cmd...) args := assignStrings3(inspectCommand, label.Command, yaml.Command) env := assignStrings3(inspectConfig.Env, label.Env, yaml.Env)