github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #192 from w9n/fix_empty_container_config

Browse Source 
allow ImageInspect.Config to be nil when parsing
This commit is contained in:
Justin Cormack 2018-01-04 11:27:42 +00:00 committed by GitHub
commit b5615a3714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/moby/config.go
View File

@ -702,9 +702,9 @@ func ConfigInspectToOCI(yaml *Image, inspect types.ImageInspect, idMap map[strin
oci := specs.Spec{} oci := specs.Spec{}
runtime := Runtime{} runtime := Runtime{}
var inspectConfig container.Config inspectConfig := &container.Config{}
if inspect.Config != nil { if inspect.Config != nil {
inspectConfig = *inspect.Config inspectConfig = inspect.Config
} }
// look for org.mobyproject.config label // 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 // 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 // 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) args := assignStrings3(inspectCommand, label.Command, yaml.Command)
env := assignStrings3(inspectConfig.Env, label.Env, yaml.Env) env := assignStrings3(inspectConfig.Env, label.Env, yaml.Env)