diff --git a/pkg/desktop/sockets_darwin.go b/pkg/desktop/sockets_darwin.go index 49a6d1fb7..79df7ca01 100644 --- a/pkg/desktop/sockets_darwin.go +++ b/pkg/desktop/sockets_darwin.go @@ -18,3 +18,7 @@ func getDockerDesktopPaths() (DockerDesktopPaths, error) { ProxySocket: filepath.Join(data, "httpproxy.sock"), }, nil } + +func IsWSL() bool { + return false +} diff --git a/pkg/desktop/sockets_linux.go b/pkg/desktop/sockets_linux.go index f98d0d0dc..81bf0c5cf 100644 --- a/pkg/desktop/sockets_linux.go +++ b/pkg/desktop/sockets_linux.go @@ -20,18 +20,13 @@ func getDockerDesktopPaths() (DockerDesktopPaths, error) { return DockerDesktopPaths{}, err } - if _, err = os.Stat("/mnt/wsl/docker-desktop/shared-sockets/host-services/backend.sock"); err == nil { - // Inside WSL2 + if IsWSL() { return DockerDesktopPaths{ BackendSocket: "/mnt/wsl/docker-desktop/shared-sockets/host-services/backend.sock", - ProxySocket: "/mnt/wsl/docker-desktop/shared-sockets/host-services/httpproxy.sock", + ProxySocket: "/mnt/wsl/docker-desktop/shared-sockets/host-services/http-proxy.sock", }, nil } - if !errors.Is(err, os.ErrNotExist) { - return DockerDesktopPaths{}, err - } - home, err := os.UserHomeDir() if err != nil { return DockerDesktopPaths{}, err @@ -43,3 +38,10 @@ func getDockerDesktopPaths() (DockerDesktopPaths, error) { ProxySocket: filepath.Join(home, ".docker", "desktop", "httpproxy.sock"), }, nil } + +func IsWSL() bool { + if _, err := os.Stat("/mnt/wsl/docker-desktop/shared-sockets/host-services/backend.sock"); err == nil { + return true + } + return false +} diff --git a/pkg/desktop/sockets_windows.go b/pkg/desktop/sockets_windows.go index 542a49839..07d99101b 100644 --- a/pkg/desktop/sockets_windows.go +++ b/pkg/desktop/sockets_windows.go @@ -16,3 +16,7 @@ func getDockerDesktopPaths() (DockerDesktopPaths, error) { ProxySocket: `\\.\pipe\dockerHTTPProxy`, }, nil } + +func IsWSL() bool { + return false +} diff --git a/pkg/remote/transport.go b/pkg/remote/transport.go index e7dfe33cb..c23a70722 100644 --- a/pkg/remote/transport.go +++ b/pkg/remote/transport.go @@ -29,7 +29,7 @@ func NewTransport(ctx context.Context) http.RoundTripper { if err != nil { return transport } - if running, ok := desktopRunning.(bool); ok && running { + if running, ok := desktopRunning.(bool); ok && running && !desktop.IsWSL() { transport.Proxy = http.ProxyURL(&url.URL{ Scheme: "http", })