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

fix error message from docker inspect 

Signed-off-by: Anda Xu <anda.xu@docker.com>
This commit is contained in:
Anda Xu 2018-05-21 09:48:24 -07:00
parent 824ce49aff
commit d2090430a6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cli/command/system/inspect.go
View File

@ -170,10 +170,6 @@ func inspectAll(ctx context.Context, dockerCli *command.DockerCli, getSize bool,
return info.Swarm.ControlAvailable return info.Swarm.ControlAvailable
} }
isErrNotSupported := func(err error) bool {
return strings.Contains(err.Error(), "not supported")
}
return func(ref string) (interface{}, []byte, error) { return func(ref string) (interface{}, []byte, error) {
const ( const (
swarmSupportUnknown = iota swarmSupportUnknown = iota
@ -201,7 +197,7 @@ func inspectAll(ctx context.Context, dockerCli *command.DockerCli, getSize bool,
} }
v, raw, err := inspectData.objectInspector(ref) v, raw, err := inspectData.objectInspector(ref)
if err != nil { if err != nil {
if typeConstraint == "" && (apiclient.IsErrNotFound(err) || isErrNotSupported(err)) { if typeConstraint == "" && isErrSkippable(err) {
continue continue
} }
return v, raw, err return v, raw, err
@ -214,3 +210,9 @@ func inspectAll(ctx context.Context, dockerCli *command.DockerCli, getSize bool,
return nil, nil, errors.Errorf("Error: No such object: %s", ref) return nil, nil, errors.Errorf("Error: No such object: %s", ref)
} }
} }
func isErrSkippable(err error) bool {
return apiclient.IsErrNotFound(err) ||
strings.Contains(err.Error(), "not supported") ||
strings.Contains(err.Error(), "invalid reference format")
}