mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Reutrn immediately when inspect connection failed
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
parent
f18c5e9714
commit
72aeb63a47
1 changed files with 15 additions and 8 deletions
|
@ -61,7 +61,11 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
|
|||
for _, name := range cmd.Args() {
|
||||
if *inspectType == "" || *inspectType == "container" {
|
||||
obj, _, err = readBody(cli.call("GET", "/containers/"+name+"/json?"+v.Encode(), nil, nil))
|
||||
if err != nil && *inspectType == "container" {
|
||||
if err != nil {
|
||||
if err == errConnectionFailed {
|
||||
return err
|
||||
}
|
||||
if *inspectType == "container" {
|
||||
if strings.Contains(err.Error(), "No such") {
|
||||
fmt.Fprintf(cli.err, "Error: No such container: %s\n", name)
|
||||
} else {
|
||||
|
@ -71,11 +75,15 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
|
|||
continue
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if obj == nil && (*inspectType == "" || *inspectType == "image") {
|
||||
obj, _, err = readBody(cli.call("GET", "/images/"+name+"/json", nil, nil))
|
||||
isImage = true
|
||||
if err != nil {
|
||||
if err == errConnectionFailed {
|
||||
return err
|
||||
}
|
||||
if strings.Contains(err.Error(), "No such") {
|
||||
if *inspectType == "" {
|
||||
fmt.Fprintf(cli.err, "Error: No such image or container: %s\n", name)
|
||||
|
@ -88,7 +96,6 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
|
|||
status = 1
|
||||
continue
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if tmpl == nil {
|
||||
|
|
Loading…
Reference in a new issue