Merge pull request #26797 from srodman7689/friendly_error_on_permissions_connection_error

Closes #26761 Updated the client/request.go sendClientRequest method to return a Pe…
This commit is contained in:
Sebastiaan van Stijn 2016-10-06 14:13:41 +02:00 committed by GitHub
commit 16a45dba89
1 changed files with 9 additions and 0 deletions

View File

@ -9,6 +9,7 @@ import (
"net"
"net/http"
"net/url"
"os"
"strings"
"github.com/docker/docker/api/types"
@ -129,6 +130,14 @@ func (cli *Client) sendClientRequest(ctx context.Context, method, path string, q
return serverResp, err
}
if nErr, ok := err.(*url.Error); ok {
if nErr, ok := nErr.Err.(*net.OpError); ok {
if os.IsPermission(nErr.Err) {
return serverResp, errors.Wrapf(err, "Got permission denied while trying to connect to the Docker daemon socket at %v", cli.host)
}
}
}
if err, ok := err.(net.Error); ok {
if err.Timeout() {
return serverResp, ErrorConnectionFailed(cli.host)