ling/hermes-agent
1
0
Fork 0
mirror of https://github.com/NousResearch/hermes-agent.git synced 2026-05-06 02:37:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: preserve docker discovery in backend preflight

Browse Source 
Follow up on salvaged PR #940 by reusing find_docker() during the new
availability check so non-PATH Docker Desktop installs still work. Add
a regression test covering the resolved executable path.
This commit is contained in:
teknium1
2026-03-14 02:50:14 -07:00
parent 59786656c5
commit 31cf535be6
2 changed files with 58 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tools/environments/docker.py
View File

@@ -85,31 +85,43 @@ _storage_opt_ok: Optional[bool] = None # cached result across instances
def _ensure_docker_available() -> None:
"""Best-effort check that the docker CLI is available before use.
This mirrors the gateway's behaviour of surfacing a clear, actionable
error when Docker is not installed or not in PATH, instead of failing
later with a low-level FileNotFoundError.
Reuses ``find_docker()`` so this preflight stays consistent with the rest of
the Docker backend, including known non-PATH Docker Desktop locations.
"""
docker_exe = find_docker()
if not docker_exe:
logger.error(
"Docker backend selected but no docker executable was found in PATH "
"or known install locations. Install Docker Desktop and ensure the "
"CLI is available."
)
raise RuntimeError(
"Docker executable not found in PATH or known install locations. "
"Install Docker and ensure the 'docker' command is available."
)
try:
result = subprocess.run(
["docker", "version"],
[docker_exe, "version"],
capture_output=True,
text=True,
timeout=5,
)
except FileNotFoundError:
logger.error(
"Docker backend selected but 'docker' executable was not found in PATH. "
"Install Docker Desktop and ensure 'docker' is available on the command line.",
"Docker backend selected but the resolved docker executable '%s' could "
"not be executed.",
docker_exe,
exc_info=True,
)
raise RuntimeError(
"Docker executable not found in PATH. Install Docker and ensure "
"the 'docker' command is available."
"Docker executable could not be executed. Check your Docker installation."
)
except subprocess.TimeoutExpired:
logger.error(
"Docker backend selected but 'docker version' timed out. "
"Docker backend selected but '%s version' timed out. "
"The Docker daemon may not be running.",
docker_exe,
exc_info=True,
)
raise RuntimeError(
@@ -124,8 +136,9 @@ def _ensure_docker_available() -> None:
else:
if result.returncode != 0:
logger.error(
"Docker backend selected but 'docker version' failed "
"Docker backend selected but '%s version' failed "
"(exit code %d, stderr=%s)",
docker_exe,
result.returncode,
result.stderr.strip(),
)