Skip to content

Commit 85baa4c

Browse files
committed
http-proxy socket is not allowed for user under WSL, we can't use it for now in Docker Desktop from WSL
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
1 parent 427e744 commit 85baa4c

4 files changed

Lines changed: 17 additions & 7 deletions

File tree

pkg/desktop/sockets_darwin.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ func getDockerDesktopPaths() (DockerDesktopPaths, error) {
1818
ProxySocket: filepath.Join(data, "httpproxy.sock"),
1919
}, nil
2020
}
21+
22+
func IsWSL() bool {
23+
return false
24+
}

pkg/desktop/sockets_linux.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,13 @@ func getDockerDesktopPaths() (DockerDesktopPaths, error) {
2020
return DockerDesktopPaths{}, err
2121
}
2222

23-
if _, err = os.Stat("/mnt/wsl/docker-desktop/shared-sockets/host-services/backend.sock"); err == nil {
24-
// Inside WSL2
23+
if IsWSL() {
2524
return DockerDesktopPaths{
2625
BackendSocket: "/mnt/wsl/docker-desktop/shared-sockets/host-services/backend.sock",
2726
ProxySocket: "/mnt/wsl/docker-desktop/shared-sockets/host-services/http-proxy.sock",
2827
}, nil
2928
}
3029

31-
if !errors.Is(err, os.ErrNotExist) {
32-
return DockerDesktopPaths{}, err
33-
}
34-
3530
home, err := os.UserHomeDir()
3631
if err != nil {
3732
return DockerDesktopPaths{}, err
@@ -43,3 +38,10 @@ func getDockerDesktopPaths() (DockerDesktopPaths, error) {
4338
ProxySocket: filepath.Join(home, ".docker", "desktop", "httpproxy.sock"),
4439
}, nil
4540
}
41+
42+
func IsWSL() bool {
43+
if _, err := os.Stat("/mnt/wsl/docker-desktop/shared-sockets/host-services/backend.sock"); err == nil {
44+
return true
45+
}
46+
return false
47+
}

pkg/desktop/sockets_windows.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,7 @@ func getDockerDesktopPaths() (DockerDesktopPaths, error) {
1616
ProxySocket: `\\.\pipe\dockerHTTPProxy`,
1717
}, nil
1818
}
19+
20+
func IsWSL() bool {
21+
return false
22+
}

pkg/remote/transport.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func NewTransport(ctx context.Context) http.RoundTripper {
2929
if err != nil {
3030
return transport
3131
}
32-
if running, ok := desktopRunning.(bool); ok && running {
32+
if running, ok := desktopRunning.(bool); ok && running && !desktop.IsWSL() {
3333
transport.Proxy = http.ProxyURL(&url.URL{
3434
Scheme: "http",
3535
})

0 commit comments

Comments
 (0)