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

Merge pull request #1479 from justincormack/command

Browse Source 
Revert Command->Args but remove from yaml where not needed
This commit is contained in:
Justin Cormack 2017-04-04 10:49:32 +01:00 committed by GitHub
commit 69b96d3aa7
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/cmd/moby/config.go
View File

@ -45,7 +45,7 @@ type MobyImage struct {
Mounts []specs.Mount Mounts []specs.Mount
Binds []string Binds []string
Tmpfs []string Tmpfs []string
Args []string Command []string
Env []string Env []string
Cwd string Cwd string
Net string Net string
@ -95,8 +95,8 @@ func ConfigToOCI(image *MobyImage) ([]byte, error) {
} }
args := append(config.Entrypoint, config.Cmd...) args := append(config.Entrypoint, config.Cmd...)
if len(image.Args) != 0 { if len(image.Command) != 0 {
args = image.Args args = image.Command
} }
env := config.Env env := config.Env
if len(image.Env) != 0 { if len(image.Env) != 0 {