kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #2279 from dotcloud/fix_docker_inspect

Browse source 
Client: improve docker inspect
This commit is contained in:
Victor Vieux 2013-10-22 17:17:35 -07:00
commit b0515a7016
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
commands.go
View file

@ -645,30 +645,39 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
cmd.Usage() cmd.Usage()
return nil return nil
} }
fmt.Fprintf(cli.out, "[")
for i, name := range args { indented := new(bytes.Buffer)
if i > 0 { status := 0
fmt.Fprintf(cli.out, ",")
} for _, name := range args {
obj, _, err := cli.call("GET", "/containers/"+name+"/json", nil) obj, _, err := cli.call("GET", "/containers/"+name+"/json", nil)
if err != nil { if err != nil {
obj, _, err = cli.call("GET", "/images/"+name+"/json", nil) obj, _, err = cli.call("GET", "/images/"+name+"/json", nil)
if err != nil { if err != nil {
fmt.Fprintf(cli.err, "No such image or container: %s\n", name) fmt.Fprintf(cli.err, "No such image or container: %s\n", name)
status = 1
continue continue
} }
} }
indented := new(bytes.Buffer)
if err = json.Indent(indented, obj, "", " "); err != nil { if err = json.Indent(indented, obj, "", " "); err != nil {
fmt.Fprintf(cli.err, "%s\n", err) fmt.Fprintf(cli.err, "%s\n", err)
status = 1
continue continue
} }
if _, err := io.Copy(cli.out, indented); err != nil { indented.WriteString(",")
fmt.Fprintf(cli.err, "%s\n", err) }
} // Remove trailling ','
indented.Truncate(indented.Len() - 1)
fmt.Fprintf(cli.out, "[")
if _, err := io.Copy(cli.out, indented); err != nil {
return err
} }
fmt.Fprintf(cli.out, "]") fmt.Fprintf(cli.out, "]")
if status != 0 {
return &utils.StatusError{Status: status}
}
return nil return nil
} }