@@ -16,17 +16,14 @@ import (

 //

 // Usage: docker attach [OPTIONS] CONTAINER

 func (cli *DockerCli) CmdAttach(args ...string) error {

-	var (

-		cmd     = cli.Subcmd("attach", []string{"CONTAINER"}, "Attach to a running container", true)

-		noStdin = cmd.Bool([]string{"#nostdin", "-no-stdin"}, false, "Do not attach STDIN")

-		proxy   = cmd.Bool([]string{"#sig-proxy", "-sig-proxy"}, true, "Proxy all received signals to the process")

-	)

+	cmd := cli.Subcmd("attach", []string{"CONTAINER"}, "Attach to a running container", true)

+	noStdin := cmd.Bool([]string{"#nostdin", "-no-stdin"}, false, "Do not attach STDIN")

+	proxy := cmd.Bool([]string{"#sig-proxy", "-sig-proxy"}, true, "Proxy all received signals to the process")

 	cmd.Require(flag.Exact, 1)

 	cmd.ParseFlags(args, true)

-	name := cmd.Arg(0)

-	stream, _, _, err := cli.call("GET", "/containers/"+name+"/json", nil, nil)

+	stream, _, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil, nil)

 	if err != nil {

 		return err

 	}

@@ -60,8 +60,8 @@ func (cli *DockerCli) CmdBuild(args ...string) error {

 	flCPUSetCpus := cmd.String([]string{"-cpuset-cpus"}, "", "CPUs in which to allow execution (0-3, 0,1)")

 	flCPUSetMems := cmd.String([]string{"-cpuset-mems"}, "", "MEMs in which to allow execution (0-3, 0,1)")

 	flCgroupParent := cmd.String([]string{"-cgroup-parent"}, "", "Optional parent cgroup for the container")

-

 	cmd.Require(flag.Exact, 1)

+

 	cmd.ParseFlags(args, true)

 	var (

@@ -27,6 +27,7 @@ func (cli *DockerCli) CmdCommit(args ...string) error {

 	flConfig := cmd.String([]string{"#run", "#-run"}, "", "This option is deprecated and will be removed in a future version in favor of inline Dockerfile-compatible commands")

 	cmd.Require(flag.Max, 2)

 	cmd.Require(flag.Min, 1)

+

 	cmd.ParseFlags(args, true)

 	var (

@@ -19,6 +19,7 @@ import (

 func (cli *DockerCli) CmdDiff(args ...string) error {

 	cmd := cli.Subcmd("diff", []string{"CONTAINER"}, "Inspect changes on a container's filesystem", true)

 	cmd.Require(flag.Exact, 1)

+

 	cmd.ParseFlags(args, true)

 	if cmd.Arg(0) == "" {

@@ -22,6 +22,7 @@ func (cli *DockerCli) CmdHistory(args ...string) error {

 	quiet := cmd.Bool([]string{"q", "-quiet"}, false, "Only show numeric IDs")

 	noTrunc := cmd.Bool([]string{"#notrunc", "-no-trunc"}, false, "Don't truncate output")

 	cmd.Require(flag.Exact, 1)

+

 	cmd.ParseFlags(args, true)

 	rdr, _, _, err := cli.call("GET", "/images/"+cmd.Arg(0)+"/history", nil, nil)

@@ -30,6 +30,7 @@ func (cli *DockerCli) CmdImages(args ...string) error {

 	flFilter := opts.NewListOpts(nil)

 	cmd.Var(&flFilter, []string{"f", "-filter"}, "Filter output based on conditions provided")

 	cmd.Require(flag.Max, 1)

+

 	cmd.ParseFlags(args, true)

 	// Consolidate all filter flags, and sanity check them early.

@@ -16,6 +16,7 @@ import (

 func (cli *DockerCli) CmdInfo(args ...string) error {

 	cmd := cli.Subcmd("info", nil, "Display system-wide information", true)

 	cmd.Require(flag.Exact, 0)

+

 	cmd.ParseFlags(args, true)

 	rdr, _, _, err := cli.call("GET", "/info", nil, nil)

@@ -19,7 +19,6 @@ func (cli *DockerCli) CmdInspect(args ...string) error {

 	cmd := cli.Subcmd("inspect", []string{"CONTAINER|IMAGE [CONTAINER|IMAGE...]"}, "Return low-level information on a container or image", true)

 	tmplStr := cmd.String([]string{"f", "#format", "-format"}, "", "Format the output using the given go template")

 	inspectType := cmd.String([]string{"-type"}, "", "Return JSON for specified type, (e.g image or container)")

-

 	cmd.Require(flag.Min, 1)

 	cmd.ParseFlags(args, true)

@@ -17,6 +17,7 @@ func (cli *DockerCli) CmdLogout(args ...string) error {

 	cmd.Require(flag.Max, 1)

 	cmd.ParseFlags(args, true)

+

 	serverAddress := registry.IndexServerAddress()

 	if len(cmd.Args()) > 0 {

 		serverAddress = cmd.Arg(0)

@@ -15,13 +15,11 @@ import (

 //

 // docker logs [OPTIONS] CONTAINER

 func (cli *DockerCli) CmdLogs(args ...string) error {

-	var (

-		cmd    = cli.Subcmd("logs", []string{"CONTAINER"}, "Fetch the logs of a container", true)

-		follow = cmd.Bool([]string{"f", "-follow"}, false, "Follow log output")

-		since  = cmd.String([]string{"-since"}, "", "Show logs since timestamp")

-		times  = cmd.Bool([]string{"t", "-timestamps"}, false, "Show timestamps")

-		tail   = cmd.String([]string{"-tail"}, "all", "Number of lines to show from the end of the logs")

-	)

+	cmd := cli.Subcmd("logs", []string{"CONTAINER"}, "Fetch the logs of a container", true)

+	follow := cmd.Bool([]string{"f", "-follow"}, false, "Follow log output")

+	since := cmd.String([]string{"-since"}, "", "Show logs since timestamp")

+	times := cmd.Bool([]string{"t", "-timestamps"}, false, "Show timestamps")

+	tail := cmd.String([]string{"-tail"}, "all", "Number of lines to show from the end of the logs")

 	cmd.Require(flag.Exact, 1)

 	cmd.ParseFlags(args, true)

@@ -12,6 +12,7 @@ import (

 func (cli *DockerCli) CmdPause(args ...string) error {

 	cmd := cli.Subcmd("pause", []string{"CONTAINER [CONTAINER...]"}, "Pause all processes within a container", true)

 	cmd.Require(flag.Min, 1)

+

 	cmd.ParseFlags(args, true)

 	var errNames []string

@@ -16,6 +16,7 @@ import (

 func (cli *DockerCli) CmdPort(args ...string) error {

 	cmd := cli.Subcmd("port", []string{"CONTAINER [PRIVATE_PORT[/PROTO]]"}, "List port mappings for the CONTAINER, or lookup the public-facing port that\nis NAT-ed to the PRIVATE_PORT", true)

 	cmd.Require(flag.Min, 1)

+

 	cmd.ParseFlags(args, true)

 	stream, _, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil, nil)

@@ -18,9 +18,7 @@ func (cli *DockerCli) CmdPush(args ...string) error {

 	cmd.ParseFlags(args, true)

-	name := cmd.Arg(0)

-

-	remote, tag := parsers.ParseRepositoryTag(name)

+	remote, tag := parsers.ParseRepositoryTag(cmd.Arg(0))

 	// Resolve the Repository name from fqn to RepositoryInfo

 	repoInfo, err := registry.ParseRepositoryInfo(remote)

@@ -12,6 +12,7 @@ import (

 func (cli *DockerCli) CmdRename(args ...string) error {

 	cmd := cli.Subcmd("rename", []string{"OLD_NAME NEW_NAME"}, "Rename a container", true)

 	cmd.Require(flag.Exact, 2)

+

 	cmd.ParseFlags(args, true)

 	oldName := cmd.Arg(0)

@@ -13,12 +13,11 @@ import (

 //

 // Usage: docker rmi [OPTIONS] IMAGE [IMAGE...]

 func (cli *DockerCli) CmdRmi(args ...string) error {

-	var (

-		cmd     = cli.Subcmd("rmi", []string{"IMAGE [IMAGE...]"}, "Remove one or more images", true)

-		force   = cmd.Bool([]string{"f", "-force"}, false, "Force removal of the image")

-		noprune = cmd.Bool([]string{"-no-prune"}, false, "Do not delete untagged parents")

-	)

+	cmd := cli.Subcmd("rmi", []string{"IMAGE [IMAGE...]"}, "Remove one or more images", true)

+	force := cmd.Bool([]string{"f", "-force"}, false, "Force removal of the image")

+	noprune := cmd.Bool([]string{"-no-prune"}, false, "Do not delete untagged parents")

 	cmd.Require(flag.Min, 1)

+

 	cmd.ParseFlags(args, true)

 	v := url.Values{}

@@ -44,18 +44,18 @@ func (cli *DockerCli) forwardAllSignals(cid string) chan os.Signal {

 //

 // Usage: docker start [OPTIONS] CONTAINER [CONTAINER...]

 func (cli *DockerCli) CmdStart(args ...string) error {

+	cmd := cli.Subcmd("start", []string{"CONTAINER [CONTAINER...]"}, "Start one or more stopped containers", true)

+	attach := cmd.Bool([]string{"a", "-attach"}, false, "Attach STDOUT/STDERR and forward signals")

+	openStdin := cmd.Bool([]string{"i", "-interactive"}, false, "Attach container's STDIN")

+	cmd.Require(flag.Min, 1)

+

+	cmd.ParseFlags(args, true)

+

 	var (

 		cErr chan error

 		tty  bool

-

-		cmd       = cli.Subcmd("start", []string{"CONTAINER [CONTAINER...]"}, "Start one or more stopped containers", true)

-		attach    = cmd.Bool([]string{"a", "-attach"}, false, "Attach STDOUT/STDERR and forward signals")

-		openStdin = cmd.Bool([]string{"i", "-interactive"}, false, "Attach container's STDIN")

 	)

-	cmd.Require(flag.Min, 1)

-	cmd.ParseFlags(args, true)

-

 	if *attach || *openStdin {

 		if cmd.NArg() > 1 {

 			return fmt.Errorf("You cannot start and attach multiple containers at once.")

@@ -127,6 +127,7 @@ func (cli *DockerCli) CmdStats(args ...string) error {

 	cmd := cli.Subcmd("stats", []string{"CONTAINER [CONTAINER...]"}, "Display a live stream of one or more containers' resource usage statistics", true)

 	noStream := cmd.Bool([]string{"-no-stream"}, false, "Disable streaming stats and only pull the first result")

 	cmd.Require(flag.Min, 1)

+

 	cmd.ParseFlags(args, true)

 	names := cmd.Args()

@@ -12,6 +12,7 @@ import (

 func (cli *DockerCli) CmdUnpause(args ...string) error {

 	cmd := cli.Subcmd("unpause", []string{"CONTAINER [CONTAINER...]"}, "Unpause all processes within a container", true)

 	cmd.Require(flag.Min, 1)

+

 	cmd.ParseFlags(args, true)

 	var errNames []string