From cc9ed0a31b0656c58ad7953f2c54d46258380443 Mon Sep 17 00:00:00 2001 From: Yanqiang Miao Date: Sat, 10 Dec 2016 16:03:38 +0800 Subject: [PATCH] Improve the error print of image inspect Signed-off-by: Yanqiang Miao --- daemon/image_inspect.go | 4 ++-- integration-cli/daemon/daemon.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/image_inspect.go b/daemon/image_inspect.go index ebf912469c..5a05247099 100644 --- a/daemon/image_inspect.go +++ b/daemon/image_inspect.go @@ -1,12 +1,12 @@ package daemon import ( - "fmt" "time" "github.com/docker/docker/api/types" "github.com/docker/docker/layer" "github.com/docker/docker/reference" + "github.com/pkg/errors" ) // LookupImage looks up an image by name and returns it as an ImageInspect @@ -14,7 +14,7 @@ import ( func (daemon *Daemon) LookupImage(name string) (*types.ImageInspect, error) { img, err := daemon.GetImage(name) if err != nil { - return nil, fmt.Errorf("No such image: %s", name) + return nil, errors.Wrapf(err, "no such image: %s", name) } refs := daemon.referenceStore.References(img.ID().Digest()) diff --git a/integration-cli/daemon/daemon.go b/integration-cli/daemon/daemon.go index 60ba39f8f6..eee6f0ed70 100644 --- a/integration-cli/daemon/daemon.go +++ b/integration-cli/daemon/daemon.go @@ -761,7 +761,7 @@ func WaitInspectWithArgs(dockerBinary, name, expr, expected string, timeout time for { result := icmd.RunCommand(dockerBinary, args...) if result.Error != nil { - if !strings.Contains(result.Stderr(), "No such") { + if !strings.Contains(strings.ToLower(result.Stderr()), "no such") { return errors.Errorf("error executing docker inspect: %v\n%s", result.Stderr(), result.Stdout()) }