... | ... |
@@ -457,7 +457,7 @@ func (cli *DockerCli) CmdStop(args ...string) error { |
457 | 457 |
for _, name := range cmd.Args() { |
458 | 458 |
_, _, err := cli.call("POST", "/containers/"+name+"/stop?"+v.Encode(), nil) |
459 | 459 |
if err != nil { |
460 |
- fmt.Printf("%s", err) |
|
460 |
+ fmt.Fprintf(os.Stderr, "%s", err) |
|
461 | 461 |
} else { |
462 | 462 |
fmt.Println(name) |
463 | 463 |
} |
... | ... |
@@ -482,7 +482,7 @@ func (cli *DockerCli) CmdRestart(args ...string) error { |
482 | 482 |
for _, name := range cmd.Args() { |
483 | 483 |
_, _, err := cli.call("POST", "/containers/"+name+"/restart?"+v.Encode(), nil) |
484 | 484 |
if err != nil { |
485 |
- fmt.Printf("%s", err) |
|
485 |
+ fmt.Fprintf(os.Stderr, "%s", err) |
|
486 | 486 |
} else { |
487 | 487 |
fmt.Println(name) |
488 | 488 |
} |
... | ... |
@@ -503,7 +503,7 @@ func (cli *DockerCli) CmdStart(args ...string) error { |
503 | 503 |
for _, name := range args { |
504 | 504 |
_, _, err := cli.call("POST", "/containers/"+name+"/start", nil) |
505 | 505 |
if err != nil { |
506 |
- fmt.Printf("%s", err) |
|
506 |
+ fmt.Fprintf(os.Stderr, "%s", err) |
|
507 | 507 |
} else { |
508 | 508 |
fmt.Println(name) |
509 | 509 |
} |
... | ... |
@@ -520,26 +520,30 @@ func (cli *DockerCli) CmdInspect(args ...string) error { |
520 | 520 |
cmd.Usage() |
521 | 521 |
return nil |
522 | 522 |
} |
523 |
- |
|
524 |
- for _, name := range args { |
|
523 |
+ fmt.Printf("[") |
|
524 |
+ for i, name := range args { |
|
525 |
+ if i > 0 { |
|
526 |
+ fmt.Printf(",") |
|
527 |
+ } |
|
525 | 528 |
obj, _, err := cli.call("GET", "/containers/"+name+"/json", nil) |
526 | 529 |
if err != nil { |
527 | 530 |
obj, _, err = cli.call("GET", "/images/"+name+"/json", nil) |
528 | 531 |
if err != nil { |
529 |
- fmt.Printf("%s", err) |
|
532 |
+ fmt.Fprintf(os.Stderr, "%s", err) |
|
530 | 533 |
continue |
531 | 534 |
} |
532 | 535 |
} |
533 | 536 |
|
534 | 537 |
indented := new(bytes.Buffer) |
535 | 538 |
if err = json.Indent(indented, obj, "", " "); err != nil { |
536 |
- fmt.Printf("%s", err) |
|
539 |
+ fmt.Fprintf(os.Stderr, "%s", err) |
|
537 | 540 |
continue |
538 | 541 |
} |
539 | 542 |
if _, err := io.Copy(os.Stdout, indented); err != nil { |
540 |
- fmt.Printf("%s", err) |
|
543 |
+ fmt.Fprintf(os.Stderr, "%s", err) |
|
541 | 544 |
} |
542 | 545 |
} |
546 |
+ fmt.Printf("]") |
|
543 | 547 |
return nil |
544 | 548 |
} |
545 | 549 |
|