p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

'docker inspect' can be used on images and containers

Browse Source 
Upstream-commit: 1b898574cf8d814c453755d83065b22c211f6a29
Component: engine
This commit is contained in:
Solomon Hykes
2013-01-28 23:22:45 -08:00
parent b6d8688923
commit d92664f491
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
components/engine/dockerd/dockerd.go
View File

@ -200,21 +200,26 @@ func (srv *Server) CmdInspect(stdin io.ReadCloser, stdout io.Writer, args ...str
return nil
}
name := cmd.Arg(0)
var obj interface{}
if container := srv.containers.Get(name); container != nil {
data, err := json.Marshal(container)
if err != nil {
return err
}
indented := new(bytes.Buffer)
if err = json.Indent(indented, data, "", " "); err != nil {
return err
}
if _, err := io.Copy(stdout, indented); err != nil {
return err
}
return nil
obj = container
} else if image := srv.images.Find(name); image != nil {
obj = image
} else {
return errors.New("No such container or image: " + name)
}
return errors.New("No such container: " + name)
data, err := json.Marshal(obj)
if err != nil {
return err
}
indented := new(bytes.Buffer)
if err = json.Indent(indented, data, "", " "); err != nil {
return err
}
if _, err := io.Copy(stdout, indented); err != nil {
return err
}
return nil
}
func (srv *Server) CmdRm(stdin io.ReadCloser, stdout io.Writer, args ...string) error {