Fixed 'docker inspect' to exit silently when an image doesn't exist
This commit is contained in:
parent
d9471bee3d
commit
f37c432bd5
|
@ -234,9 +234,7 @@ func (srv *Server) CmdInspect(stdin io.ReadCloser, stdout io.Writer, args ...str
|
||||||
var obj interface{}
|
var obj interface{}
|
||||||
if container := srv.runtime.Get(name); container != nil {
|
if container := srv.runtime.Get(name); container != nil {
|
||||||
obj = container
|
obj = container
|
||||||
} else if image, err := srv.runtime.repositories.LookupImage(name); err != nil {
|
} else if image, err := srv.runtime.repositories.LookupImage(name); err == nil && image != nil {
|
||||||
return err
|
|
||||||
} else if image != nil {
|
|
||||||
obj = image
|
obj = image
|
||||||
} else {
|
} else {
|
||||||
// No output means the object does not exist
|
// No output means the object does not exist
|
||||||
|
|
Loading…
Reference in New Issue