From c349c9d14a1c4bf04f35f3f5c62b0bb92614bc81 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Fri, 14 Mar 2014 00:47:13 +0000 Subject: [PATCH] create the cli obj before calling parseCommand Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) --- api/client.go | 4 +--- docker/docker.go | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/api/client.go b/api/client.go index 858c2bcf25..715f58ab06 100644 --- a/api/client.go +++ b/api/client.go @@ -57,9 +57,7 @@ func (cli *DockerCli) getMethod(name string) (func(...string) error, bool) { return method.Interface().(func(...string) error), true } -func ParseCommands(proto, addr string, args ...string) error { - cli := NewDockerCli(os.Stdin, os.Stdout, os.Stderr, proto, addr) - +func (cli *DockerCli) ParseCommands(args ...string) error { if len(args) > 0 { method, exists := cli.getMethod(args[0]) if !exists { diff --git a/docker/docker.go b/docker/docker.go index cc4d40f3ac..749857a640 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -148,7 +148,8 @@ func main() { log.Fatal("Please specify only one -H") } protoAddrParts := strings.SplitN(flHosts.GetAll()[0], "://", 2) - if err := api.ParseCommands(protoAddrParts[0], protoAddrParts[1], flag.Args()...); err != nil { + cli := api.NewDockerCli(os.Stdin, os.Stdout, os.Stderr, protoAddrParts[0], protoAddrParts[1]) + if err := cli.ParseCommands(flag.Args()...); err != nil { if sterr, ok := err.(*utils.StatusError); ok { if sterr.Status != "" { log.Println(sterr.Status)