From bd87295e43be1798db192c6ee4880f481951ee2e Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@docker.com>
Date: Tue, 4 Apr 2017 09:51:17 +0100
Subject: [PATCH] Revert Command->Args but remove from yaml where not needed

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>
---
 src/cmd/moby/config.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cmd/moby/config.go b/src/cmd/moby/config.go
index 2ea34e57a..ab788091e 100644
--- a/src/cmd/moby/config.go
+++ b/src/cmd/moby/config.go
@@ -45,7 +45,7 @@ type MobyImage struct {
 	Mounts           []specs.Mount
 	Binds            []string
 	Tmpfs            []string
-	Args             []string
+	Command          []string
 	Env              []string
 	Cwd              string
 	Net              string
@@ -95,8 +95,8 @@ func ConfigToOCI(image *MobyImage) ([]byte, error) {
 	}
 
 	args := append(config.Entrypoint, config.Cmd...)
-	if len(image.Args) != 0 {
-		args = image.Args
+	if len(image.Command) != 0 {
+		args = image.Command
 	}
 	env := config.Env
 	if len(image.Env) != 0 {