release: v0.9.5 [skip ci]

.taskid

@@ -1 +1 @@
-DEVX-23
+DEVX-26

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.9.5] - 2026-06-24
+
+### Bug Fixes
+
+- Use host Docker socket with DOCKER_HOST fallback to local dockerd
+- Use host Docker socket with DOCKER_HOST fallback to local dockerd
+
+## [0.9.4] - 2026-06-24
+
+### Bug Fixes
+
+- Use separate Docker socket for DinD in CI
+
 ## [0.9.3] - 2026-06-24
 
 ### Bug Fixes

src/devx/__init__.py

@@ -1,3 +1,3 @@
 """devx — reusable development and CI/CD tools for oblachno-oss projects."""
 
-__version__ = "0.9.3"
+__version__ = "0.9.5"

src/devx/molecule/start_docker.py

@@ -1,10 +1,13 @@
 #!/usr/bin/env python3
-"""Start a Docker daemon inside a CI runner container (Docker-in-Docker).
+"""Ensure Docker is available for molecule tests in CI.
 
 CI runners (e.g. ``gitea/runner-images:ubuntu-latest``) may have the host's
-Docker socket mounted, but molecule needs a local Docker daemon to create
-nested containers. This module always starts ``dockerd`` in the background
-and waits for it to become ready.
+Docker socket mounted. This module verifies Docker is accessible and
+sets ``DOCKER_HOST`` explicitly so molecule's Python docker library
+connects to the same socket as the Docker CLI.
+
+If the host socket is not available, it starts a local ``dockerd``
+with the vfs storage driver (requires privileged container).
 
 Usage::
 
@@ -13,6 +16,7 @@ Usage::
 
 from __future__ import annotations
 
+import os
 import subprocess  # nosec B404
 import sys
 import tempfile
@@ -23,34 +27,51 @@ import click
 from devx.i18n import _
 
 DEFAULT_TIMEOUT = 30
+DOCKER_SOCK = "/var/run/docker.sock"
 
 
 def is_docker_ready() -> bool:
-    """Check if the Docker daemon is responding."""
+    """Check if Docker daemon is responding on the configured socket."""
     result = subprocess.run(  # nosec B603 B607
         ["docker", "info"],
         capture_output=True,
         check=False,
+        env={**os.environ, "DOCKER_HOST": f"unix://{DOCKER_SOCK}"},
     )
     return result.returncode == 0
 
 
 def start_docker_daemon(timeout: int = DEFAULT_TIMEOUT) -> bool:
-    """Start dockerd in the background and wait for it to be ready.
+    """Ensure Docker is ready for molecule tests.
 
-    Always starts a local dockerd even if ``docker info`` succeeds,
-    because the host socket may be mounted but not suitable for
-    molecule's nested container creation.
+    First tries the host socket. If that works, sets ``DOCKER_HOST`` and
+    returns immediately. If not, starts a local ``dockerd`` with vfs
+    storage driver (requires privileged container).
 
     Returns ``True`` if Docker is ready, ``False`` if it failed to
     start within the timeout.
     """
+    # Point Docker CLI and Python library to the socket explicitly
+    os.environ["DOCKER_HOST"] = f"unix://{DOCKER_SOCK}"
+
+    # Check if host Docker is already available
+    if is_docker_ready():
+        click.echo(_("Docker daemon already running"))
+        return True
+
+    # Start local dockerd (requires privileged container)
     click.echo(_("Starting Docker daemon..."))
     log_file = tempfile.NamedTemporaryFile(  # noqa: SIM115
         mode="w", suffix="dockerd.log", delete=False
     )
     subprocess.Popen(  # nosec B603 B607
-        ["dockerd", "--storage-driver", "vfs"],
+        [
+            "dockerd",
+            "--storage-driver",
+            "vfs",
+            "-H",
+            f"unix://{DOCKER_SOCK}",
+        ],
         stdout=log_file,
         stderr=subprocess.STDOUT,
         start_new_session=True,

src/devx/translations.json

@@ -419,6 +419,13 @@
     "ru": "Created release commit.",
     "zh": "Created release commit."
   },
+  "Docker daemon already running": {
+    "bg": "Докер демонът вече работи",
+    "de": "Docker-Daemon läuft bereits",
+    "en": "Docker daemon already running",
+    "ru": "Демон Docker уже работает",
+    "zh": "Docker 守护进程已在运行"
+  },
   "Docker daemon failed to start": {
     "bg": "Docker daemon failed to start",
     "de": "Docker-Daemon konnte nicht gestartet werden",

tests/unit/test_start_docker.py

@@ -4,7 +4,7 @@ from unittest.mock import MagicMock, patch
 
 from click.testing import CliRunner
 
-from devx.molecule.start_docker import is_docker_ready, main, start_docker_daemon
+from devx.molecule.start_docker import DOCKER_SOCK, is_docker_ready, main, start_docker_daemon
 
 
 class TestIsDockerReady:
@@ -12,7 +12,9 @@ class TestIsDockerReady:
     def test_ready(self, mock_run: MagicMock) -> None:
         mock_run.return_value = MagicMock(returncode=0)
         assert is_docker_ready() is True
-        mock_run.assert_called_once_with(["docker", "info"], capture_output=True, check=False)
+        call_kwargs = mock_run.call_args
+        assert call_kwargs.args[0] == ["docker", "info"]
+        assert call_kwargs.kwargs["env"]["DOCKER_HOST"] == f"unix://{DOCKER_SOCK}"
 
     @patch("devx.molecule.start_docker.subprocess.run")
     def test_not_ready(self, mock_run: MagicMock) -> None:
@@ -21,11 +23,17 @@ class TestIsDockerReady:
 
 
 class TestStartDockerDaemon:
+    @patch("devx.molecule.start_docker.is_docker_ready", return_value=True)
+    def test_host_socket_available(self, mock_ready: MagicMock) -> None:
+        """Should return immediately if host Docker is available."""
+        assert start_docker_daemon(timeout=5) is True
+        mock_ready.assert_called_once()
+
     @patch("devx.molecule.start_docker.time.sleep")
     @patch("devx.molecule.start_docker.is_docker_ready")
     @patch("devx.molecule.start_docker.subprocess.Popen")
     @patch("devx.molecule.start_docker.tempfile.NamedTemporaryFile")
-    def test_starts_successfully(
+    def test_starts_local_daemon(
         self,
         mock_ntf: MagicMock,
         mock_popen: MagicMock,
@@ -33,11 +41,17 @@ class TestStartDockerDaemon:
         mock_sleep: MagicMock,
     ) -> None:
         mock_ntf.return_value = MagicMock()
-        # First loop iteration: dockerd not ready yet. Second: ready.
-        mock_ready.side_effect = [False, True]
+        # Host socket not available, then local daemon starts on third check
+        mock_ready.side_effect = [False, False, False, True]
         assert start_docker_daemon(timeout=5) is True
         mock_popen.assert_called_once()
-        mock_sleep.assert_called_once_with(1)
+        popen_args = mock_popen.call_args.args[0]
+        assert "dockerd" in popen_args
+        assert "--storage-driver" in popen_args
+        assert "vfs" in popen_args
+        assert "-H" in popen_args
+        assert f"unix://{DOCKER_SOCK}" in popen_args
+        assert mock_sleep.call_count == 2
 
     @patch("devx.molecule.start_docker.time.sleep")
     @patch("devx.molecule.start_docker.is_docker_ready", return_value=False)
@@ -59,7 +73,7 @@ class TestStartDockerDaemon:
     @patch("devx.molecule.start_docker.is_docker_ready")
     @patch("devx.molecule.start_docker.subprocess.Popen")
     @patch("devx.molecule.start_docker.tempfile.NamedTemporaryFile")
-    def test_ready_on_first_check(
+    def test_local_daemon_ready_on_first_check(
         self,
         mock_ntf: MagicMock,
         mock_popen: MagicMock,
@@ -67,27 +81,22 @@ class TestStartDockerDaemon:
         mock_sleep: MagicMock,
     ) -> None:
         mock_ntf.return_value = MagicMock()
-        mock_ready.return_value = True
+        # Host not available, local daemon ready on first loop check
+        mock_ready.side_effect = [False, False, True]
         assert start_docker_daemon(timeout=5) is True
         mock_popen.assert_called_once()
-        mock_sleep.assert_not_called()
+        mock_sleep.assert_called_once_with(1)
 
-    @patch("devx.molecule.start_docker.time.sleep")
-    @patch("devx.molecule.start_docker.is_docker_ready")
-    @patch("devx.molecule.start_docker.subprocess.Popen")
-    @patch("devx.molecule.start_docker.tempfile.NamedTemporaryFile")
-    def test_custom_timeout(
+    @patch("devx.molecule.start_docker.os.environ")
+    @patch("devx.molecule.start_docker.is_docker_ready", return_value=True)
+    def test_sets_docker_host(
         self,
-        mock_ntf: MagicMock,
-        mock_popen: MagicMock,
         mock_ready: MagicMock,
-        mock_sleep: MagicMock,
+        mock_environ: MagicMock,
     ) -> None:
-        mock_ntf.return_value = MagicMock()
-        # 9 iterations not ready, 10th ready.
-        mock_ready.side_effect = [False] * 9 + [True]
-        assert start_docker_daemon(timeout=10) is True
-        assert mock_sleep.call_count == 9
+        """DOCKER_HOST must be set so molecule connects to correct socket."""
+        start_docker_daemon(timeout=5)
+        mock_environ.__setitem__.assert_called_with("DOCKER_HOST", f"unix://{DOCKER_SOCK}")
 
 
 class TestMain: