0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add -format to 'docker inspect'

Browse source 
This makes it a lot easier to script with docker instances as one can
ask for details about running instances more easily without having to
have additional JSON processing tools installed.

dotcloud/docker#734
This commit is contained in:
Dustin Sallings 2013-11-27 15:07:15 -08:00
parent 4b35c1b6a6
commit 9837ad8e9b
1 changed files with 40 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
commands.go
View file

@ -31,6 +31,7 @@ import (
"strings" "strings"
"syscall" "syscall"
"text/tabwriter" "text/tabwriter"
"text/template"
"time" "time"
) )
@ -632,6 +633,7 @@ func (cli *DockerCli) CmdStart(args ...string) error {
func (cli *DockerCli) CmdInspect(args ...string) error { func (cli *DockerCli) CmdInspect(args ...string) error {
cmd := cli.Subcmd("inspect", "CONTAINER|IMAGE [CONTAINER|IMAGE...]", "Return low-level information on a container/image") cmd := cli.Subcmd("inspect", "CONTAINER|IMAGE [CONTAINER|IMAGE...]", "Return low-level information on a container/image")
tmplStr := cmd.String("format", "", "Format the output using the given go template.")
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {
return nil return nil
} }
@ -640,10 +642,21 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
return nil return nil
} }
var tmpl *template.Template
if *tmplStr != "" {
var err error
if tmpl, err = template.New("").Parse(*tmplStr); err != nil {
fmt.Fprintf(cli.err, "Template parsing error: %v\n", err)
return &utils.StatusError{StatusCode: 64,
Status: "Template parsing error: " + err.Error()}
}
}
indented := new(bytes.Buffer) indented := new(bytes.Buffer)
indented.WriteByte('[')
status := 0 status := 0
for _, name := range args { for _, name := range cmd.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)
@ -658,23 +671,40 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
} }
} }
if err = json.Indent(indented, obj, "", " "); err != nil { if tmpl == nil {
fmt.Fprintf(cli.err, "%s\n", err) if err = json.Indent(indented, obj, "", " "); err != nil {
status = 1 fmt.Fprintf(cli.err, "%s\n", err)
continue status = 1
continue
}
} else {
// Has template, will render
var value interface{}
if err := json.Unmarshal(obj, &value); err != nil {
fmt.Fprintf(cli.err, "%s\n", err)
status = 1
continue
}
if err := tmpl.Execute(cli.out, value); err != nil {
return err
}
cli.out.Write([]byte{'\n'})
} }
indented.WriteString(",") indented.WriteString(",")
} }
if indented.Len() > 0 { if indented.Len() > 1 {
// Remove trailing ',' // Remove trailing ','
indented.Truncate(indented.Len() - 1) indented.Truncate(indented.Len() - 1)
} }
fmt.Fprintf(cli.out, "[") indented.WriteByte(']')
if _, err := io.Copy(cli.out, indented); err != nil {
return err if tmpl == nil {
if _, err := io.Copy(cli.out, indented); err != nil {
return err
}
} }
fmt.Fprintf(cli.out, "]")
if status != 0 { if status != 0 {
return &utils.StatusError{StatusCode: status} return &utils.StatusError{StatusCode: status}
} }