Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 9cc467c

Browse files
authored
Merge pull request #344 from thaJeztah/19.03_backport_DESKTOP_1286_win_admin_error_readability
[19.03 backport] Improve readability of Windows connect error
2 parents 04995b6 + 239ac23 commit 9cc467c

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

client/request.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,13 @@ func (cli *Client) doRequest(ctx context.Context, req *http.Request) (serverResp
178178
// this is localised - for example in French the error would be
179179
// `open //./pipe/docker_engine: Le fichier spécifié est introuvable.`
180180
if strings.Contains(err.Error(), `open //./pipe/docker_engine`) {
181-
err = errors.New(err.Error() + " In the default daemon configuration on Windows, the docker client must be run elevated to connect. This error may also indicate that the docker daemon is not running.")
181+
// Checks if client is running with elevated privileges
182+
if f, elevatedErr := os.Open("\\\\.\\PHYSICALDRIVE0"); elevatedErr == nil {
183+
err = errors.Wrap(err, "In the default daemon configuration on Windows, the docker client must be run with elevated privileges to connect.")
184+
} else {
185+
f.Close()
186+
err = errors.Wrap(err, "This error may indicate that the docker daemon is not running.")
187+
}
182188
}
183189

184190
return serverResp, errors.Wrap(err, "error during connect")

0 commit comments

Comments
 (0)