starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-10-13 09:23:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28659 from xuzhenglun/master

Browse Source 
bugfix: incorrect ErrConnectFailed Comparison
Upstream-commit: d1258c761a9d2fac6c7830c77c7d8f91426bada3
Component: engine
This commit is contained in:
Vincent Demeester
2016-11-22 13:01:05 +01:00
committed by GitHub
parent b13fc57c66 3bfc791696
commit 33dbfcc591
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/cli/command/container/exec.go
+1 -1
View File
@@ -170,7 +170,7 @@ func getExecExitCode(ctx context.Context, client apiclient.ContainerAPIClient, e
resp, err := client.ContainerExecInspect(ctx, execID)
if err != nil {
// If we can't connect, then the daemon probably died.
if err != apiclient.ErrConnectionFailed {
if !apiclient.IsErrConnectionFailed(err) {
return false, -1, err
}
return false, -1, nil
components/engine/cli/command/container/utils.go
+1 -1
View File
@@ -91,7 +91,7 @@ func getExitCode(ctx context.Context, dockerCli *command.DockerCli, containerID
c, err := dockerCli.Client().ContainerInspect(ctx, containerID)
if err != nil {
// If we can't connect, then the daemon probably died.
if err != clientapi.ErrConnectionFailed {
if !clientapi.IsErrConnectionFailed(err) {
return false, -1, err
}
return false, -1, nil