docker: update socket location (#5961)

Signed-off-by: Nick Santos <[email protected]> Signed-off-by: Nick Santos <[email protected]>
tilt-dev · Oct 22, 2022 · a1be613 · a1be613
1 parent adbbfb4
commit a1be613
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/internal/docker/client_test.go b/internal/docker/client_test.go
@@ -327,6 +327,21 @@ func TestProvideClusterProduct(t *testing.T) {
 				BuildToKubeContexts: []string{"docker-desktop-me", "docker-desktop-me"},
 			},
 		},
+		{
+			env:     clusterid.ProductDockerDesktop,
+			runtime: container.RuntimeDocker,
+			osEnv: map[string]string{
+				"DOCKER_HOST": "unix:///home/tilt/.docker/run/docker.sock",
+			},
+			expectedCluster: Env{
+				Client:              hostClient{Host: "unix:///home/tilt/.docker/run/docker.sock"},
+				BuildToKubeContexts: []string{"docker-desktop-me"},
+			},
+			expectedLocal: Env{
+				Client:              hostClient{Host: "unix:///home/tilt/.docker/run/docker.sock"},
+				BuildToKubeContexts: []string{"docker-desktop-me", "docker-desktop-me"},
+			},
+		},
 		{
 			env:     clusterid.ProductRancherDesktop,
 			runtime: container.RuntimeDocker,

diff --git a/internal/docker/env.go b/internal/docker/env.go
@@ -305,6 +305,9 @@ func isDefaultHost(e Env) bool {
 			// Docker Desktop for Linux - socket is in ~/.docker/desktop/docker.sock
 			(strings.HasPrefix(host, "unix://") && strings.HasSuffix(host, "/.docker/desktop/docker.sock")) ||
 
+			// Docker Desktop for Mac 4.13+ - socket is in ~/.docker/run/docker.sock
+			(strings.HasPrefix(host, "unix://") && strings.HasSuffix(host, "/.docker/run/docker.sock")) ||
+
 			// Rancher Desktop without admin access on Linux/Mac is in ~/.rd/docker.sock
 			(strings.HasPrefix(host, "unix://") && strings.HasSuffix(host, "/.rd/docker.sock"))