docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13141 from vieux/fallback_inspect 

fallback to interface with docker inspect
This commit is contained in:
Jessie Frazelle 2015-05-12 11:02:06 -07:00
parent 445afe0977 52c3bb6a0e
commit d4eba30065
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
api/client/inspect.go
View File

@ -59,7 +59,8 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
continue continue
} }
} else { } else {
dec := json.NewDecoder(bytes.NewReader(obj)) rdr := bytes.NewReader(obj)
dec := json.NewDecoder(rdr)
if isImage { if isImage {
inspPtr := types.ImageInspect{} inspPtr := types.ImageInspect{}
@ -69,7 +70,14 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
continue continue
} }
if err := tmpl.Execute(cli.out, inspPtr); err != nil { if err := tmpl.Execute(cli.out, inspPtr); err != nil {
return err rdr.Seek(0, 0)
var raw interface{}
if err := dec.Decode(&raw); err != nil {
return err
}
if err = tmpl.Execute(cli.out, raw); err != nil {
return err
}
} }
} else { } else {
inspPtr := types.ContainerJSON{} inspPtr := types.ContainerJSON{}
@ -79,8 +87,14 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
continue continue
} }
if err := tmpl.Execute(cli.out, inspPtr); err != nil { if err := tmpl.Execute(cli.out, inspPtr); err != nil {
return err rdr.Seek(0, 0)
var raw interface{}
if err := dec.Decode(&raw); err != nil {
return err
}
if err = tmpl.Execute(cli.out, raw); err != nil {
return err
}
} }
} }
cli.out.Write([]byte{'\n'}) cli.out.Write([]byte{'\n'})