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

Revert Command->Args but remove from yaml where not needed

Browse Source 
In the riddler change I changed "command" in the yaml to "args"
but did not change the files. In fact we basically used the
default command everywhere so this did not actually break.

Remove the unnecessary "command" lines to simplify yaml.

Revert the command to args change for now as I think I prefer
command, but its easier to switch now. Need to think if the
entrypoint/command distinction matters before finalizing.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-04-04 09:51:17 +01:00
parent c6ba8ab4eb
commit bd87295e43
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 {