Skip to content

feat: Add support for Docker Desktop socket locations on macOS #3378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
halicki wants to merge 3 commits into
base: main
Choose a base branch
from
+334 −248
Open

feat: Add support for Docker Desktop socket locations on macOS #3378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8583c2
feat: Add support for Docker Desktop socket locations on macOS
halicki Jan 22, 2026
91b9c40
test: Add unit tests for Unix socket discovery logic
halicki Jan 23, 2026
43bf0a5
style: Fix linting errors and follow test file conventions
halicki Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion docker/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import os
import sys

from .version import __version__
Expand All @@ -11,7 +12,26 @@
]

DEFAULT_HTTP_HOST = "127.0.0.1"
DEFAULT_UNIX_SOCKET = "http+unix:///var/run/docker.sock"

# Potential Unix socket locations in order of preference
UNIX_SOCKET_PATHS = [
'/var/run/docker.sock', # Traditional Linux/macOS location
os.path.expanduser('~/.docker/run/docker.sock'), # Docker Desktop v4.x+ on macOS
os.path.expanduser('~/.docker/desktop/docker.sock'), # Older Docker Desktop location
]


def _find_available_unix_socket():
"""Find the first available Docker socket from known locations."""
for path in UNIX_SOCKET_PATHS:
if os.path.exists(path):
return f"http+unix://{path}"
# Fallback to traditional location even if it doesn't exist
return f"http+unix://{UNIX_SOCKET_PATHS[0]}"


# Dynamic default socket - checks multiple locations
DEFAULT_UNIX_SOCKET = _find_available_unix_socket()
DEFAULT_NPIPE = 'npipe:////./pipe/docker_engine'

BYTE_UNITS = {
Expand Down
17 changes: 13 additions & 4 deletions tests/unit/client_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
DEFAULT_DOCKER_API_VERSION,
DEFAULT_MAX_POOL_SIZE,
DEFAULT_TIMEOUT_SECONDS,
DEFAULT_UNIX_SOCKET,
IS_WINDOWS_PLATFORM,
)
from docker.utils import kwargs_from_env
Expand Down Expand Up @@ -89,9 +90,11 @@ def test_default_pool_size_unix(self, mock_obj):
client.ping()

base_url = f"{client.api.base_url}/v{client.api._version}/_ping"
# Extract socket path from DEFAULT_UNIX_SOCKET (remove http+unix:// prefix)
socket_path = DEFAULT_UNIX_SOCKET.replace('http+unix://', '')

mock_obj.assert_called_once_with(base_url,
"/var/run/docker.sock",
socket_path,
60,
Comment on lines 92 to 98
Copy link

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The expected socket_path is derived by duplicating part of UnixHTTPAdapter's normalization logic (replace('http+unix://', '')). This same logic is repeated in multiple tests in this file and can drift from the real adapter behavior (e.g., leading-slash normalization). Consider factoring this into a small helper in the test module or deriving the expected value using the same normalization as docker.transport.unixconn.UnixHTTPAdapter to keep assertions consistent.

Copilot uses AI. Check for mistakes.
maxsize=DEFAULT_MAX_POOL_SIZE
)
Expand Down Expand Up @@ -125,9 +128,11 @@ def test_pool_size_unix(self, mock_obj):
client.ping()

base_url = f"{client.api.base_url}/v{client.api._version}/_ping"
# Extract socket path from DEFAULT_UNIX_SOCKET (remove http+unix:// prefix)
socket_path = DEFAULT_UNIX_SOCKET.replace('http+unix://', '')

mock_obj.assert_called_once_with(base_url,
"/var/run/docker.sock",
socket_path,
60,
Comment on lines 130 to 136
Copy link

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as earlier: socket_path = DEFAULT_UNIX_SOCKET.replace('http+unix://', '') duplicates adapter parsing logic and is repeated across tests. Consider using a shared helper to avoid divergence and repetition.

Copilot uses AI. Check for mistakes.
maxsize=POOL_SIZE
)
Expand Down Expand Up @@ -198,9 +203,11 @@ def test_default_pool_size_from_env_unix(self, mock_obj):
client.ping()

base_url = f"{client.api.base_url}/v{client.api._version}/_ping"
# Extract socket path from DEFAULT_UNIX_SOCKET (remove http+unix:// prefix)
socket_path = DEFAULT_UNIX_SOCKET.replace('http+unix://', '')

mock_obj.assert_called_once_with(base_url,
"/var/run/docker.sock",
socket_path,
60,
maxsize=DEFAULT_MAX_POOL_SIZE
)
Expand Down Expand Up @@ -233,9 +240,11 @@ def test_pool_size_from_env_unix(self, mock_obj):
client.ping()

base_url = f"{client.api.base_url}/v{client.api._version}/_ping"
# Extract socket path from DEFAULT_UNIX_SOCKET (remove http+unix:// prefix)
socket_path = DEFAULT_UNIX_SOCKET.replace('http+unix://', '')

mock_obj.assert_called_once_with(base_url,
"/var/run/docker.sock",
socket_path,
60,
maxsize=POOL_SIZE
)
Expand Down
Loading
Loading