docker: update docker-desktop socket check (#6395)

fixes #6394 Signed-off-by: Nick Santos <nick.santos@docker.com>
tilt-dev · Jun 12, 2024 · 0edf8bd · 0edf8bd
1 parent 90b6ad3
commit 0edf8bd
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/internal/docker/env.go b/internal/docker/env.go
@@ -324,6 +324,9 @@ func isDefaultHost(e Env) bool {
 			// Docker Desktop for Mac 4.13+ - socket is in ~/.docker/run/docker.sock
 			(strings.HasPrefix(host, "unix://") && strings.HasSuffix(host, "/.docker/run/docker.sock")) ||
 
+			// Docker Desktop for Windows 4.31+
+			strings.HasPrefix(host, "npipe:////./pipe/dockerDesktop") ||
+
 			// Rancher Desktop without admin access on Linux/Mac is in ~/.rd/docker.sock
 			(strings.HasPrefix(host, "unix://") && strings.HasSuffix(host, "/.rd/docker.sock"))
 

diff --git a/internal/docker/env_test.go b/internal/docker/env_test.go
@@ -28,9 +28,33 @@ func (f *fakeDaemonClient) DaemonHost() string {
 	return f.host
 }
 
-func TestColimaEnv(t *testing.T) {
+func TestEnv(t *testing.T) {
 
 	table := []EnvTest{
+		{
+			product:     clusterid.ProductDockerDesktop,
+			kubecontext: "docker-desktop",
+			dockerHost:  "npipe:////./pipe/dockerDesktopLinuxEngine",
+			match:       true,
+		},
+		{
+			product:     clusterid.ProductDockerDesktop,
+			kubecontext: "docker-desktop",
+			dockerHost:  "npipe:////./pipe/docker_engine",
+			match:       true,
+		},
+		{
+			product:     clusterid.ProductDockerDesktop,
+			kubecontext: "docker-desktop",
+			dockerHost:  "unix:///var/run/docker.sock",
+			match:       true,
+		},
+		{
+			product:     clusterid.ProductDockerDesktop,
+			kubecontext: "docker-desktop",
+			dockerHost:  "unix://~/.docker/desktop/docker.sock",
+			match:       true,
+		},
 		{
 			product:     clusterid.ProductColima,
 			kubecontext: "colima",