From 86b4c08ea083279db6b4be6218496a4bc6ab32e9 Mon Sep 17 00:00:00 2001 From: enix <58286681+enixCode@users.noreply.github.com> Date: Thu, 6 Mar 2025 07:32:24 +0000 Subject: [PATCH 1/2] feat: (docker) windows support socket --- agentdesk/runtime/docker.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/agentdesk/runtime/docker.py b/agentdesk/runtime/docker.py index 1f16bbd..6f4137c 100644 --- a/agentdesk/runtime/docker.py +++ b/agentdesk/runtime/docker.py @@ -45,6 +45,8 @@ def _configure_docker_socket(self): user = os.environ.get("USER") if os.path.exists(f"/Users/{user}/.docker/run/docker.sock"): docker_socket = f"unix:///Users/{user}/.docker/run/docker.sock" + elif platform.system() == "Windows": + docker_socket = "npipe:////./pipe/docker_engine" else: raise FileNotFoundError( ( From d00926feebc012b402990e8de7fda64b26541673 Mon Sep 17 00:00:00 2001 From: enix <58286681+enixCode@users.noreply.github.com> Date: Wed, 12 Mar 2025 11:36:36 +0100 Subject: [PATCH 2/2] feat: support Windows Docker socket configuration, fix error message. --- agentdesk/runtime/docker.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/agentdesk/runtime/docker.py b/agentdesk/runtime/docker.py index 6f4137c..8506753 100644 --- a/agentdesk/runtime/docker.py +++ b/agentdesk/runtime/docker.py @@ -39,18 +39,19 @@ def __init__(self, cfg: Optional[DockerConnectConfig] = None) -> None: self.client = docker.from_env() def _configure_docker_socket(self): + docker_socket = None if os.path.exists("/var/run/docker.sock"): docker_socket = "unix:///var/run/docker.sock" + elif platform.system() == "Windows": + docker_socket = "npipe:////./pipe/docker_engine" else: user = os.environ.get("USER") if os.path.exists(f"/Users/{user}/.docker/run/docker.sock"): docker_socket = f"unix:///Users/{user}/.docker/run/docker.sock" - elif platform.system() == "Windows": - docker_socket = "npipe:////./pipe/docker_engine" - else: + if not docker_socket: raise FileNotFoundError( ( - "Neither '/var/run/docker.sock' nor '/Users//.docker/run/docker.sock' are available." + "Neither '/var/run/docker.sock'nor 'npipe:////./pipe/docker_engine' nor '/Users//.docker/run/docker.sock' are available." "Please make sure you have Docker installed and running." ) )