mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #498 from WeiZhang555/bug
Fix bug for `docker service ls`
This commit is contained in:
commit
293b811a6c
1 changed files with 4 additions and 6 deletions
|
@ -268,14 +268,12 @@ func getBackendID(cli *NetworkCli, servID string) (string, error) {
|
||||||
)
|
)
|
||||||
|
|
||||||
if obj, _, err = readBody(cli.call("GET", "/services/"+servID+"/backend", nil, nil)); err == nil {
|
if obj, _, err = readBody(cli.call("GET", "/services/"+servID+"/backend", nil, nil)); err == nil {
|
||||||
var bkl []sandboxResource
|
var sr sandboxResource
|
||||||
if err := json.NewDecoder(bytes.NewReader(obj)).Decode(&bkl); err == nil {
|
if err := json.NewDecoder(bytes.NewReader(obj)).Decode(&sr); err == nil {
|
||||||
if len(bkl) > 0 {
|
bk = sr.ContainerID
|
||||||
bk = bkl[0].ID
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
// Only print a message, don't make the caller cli fail for this
|
// Only print a message, don't make the caller cli fail for this
|
||||||
fmt.Fprintf(cli.out, "Failed to retrieve backend list for service %s (%v)", servID, err)
|
fmt.Fprintf(cli.out, "Failed to retrieve backend list for service %s (%v)\n", servID, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue