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

Merge pull request #29212 from yongtang/29185-docker-inspect 

Fix `docker plugin inspect <unkown object>` issue on Windows
This commit is contained in:
Brian Goff 2016-12-21 15:47:17 -05:00 committed by GitHub
parent 63677ef495 86a07d3fec
commit 9b17b8ea18
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
command/system/inspect.go
View File

@ -2,6 +2,7 @@ package system
import (
"fmt"
"strings"
"golang.org/x/net/context"
@ -156,6 +157,10 @@ func inspectAll(ctx context.Context, dockerCli *command.DockerCli, getSize bool,
return info.Swarm.ControlAvailable
}
isErrNotSupported := func(err error) bool {
return strings.Contains(err.Error(), "not supported")
}
return func(ref string) (interface{}, []byte, error) {
const (
swarmSupportUnknown = iota
@ -183,7 +188,7 @@ func inspectAll(ctx context.Context, dockerCli *command.DockerCli, getSize bool,
}
v, raw, err := inspectData.objectInspector(ref)
if err != nil {
if typeConstraint == "" && apiclient.IsErrNotFound(err) {
if typeConstraint == "" && (apiclient.IsErrNotFound(err) || isErrNotSupported(err)) {
continue
}
return v, raw, err