Secure, Fast, and Extensible Sandbox runtime for AI agents.
fix(server): read the sandbox image from the container config on Docker
Maohao2cf9fde65fee
diff --git a/server/opensandbox_server/services/docker/docker_service.py b/server/opensandbox_server/services/docker/docker_service.pyindex 96bb37f87..0a0e61241 100644--- a/server/opensandbox_server/services/docker/docker_service.py+++ b/server/opensandbox_server/services/docker/docker_service.py@@ -535,8 +535,9 @@ class DockerSandboxService(DockerDiagnosticsMixin, DockerRuntimeMixin, DockerVolentrypoint = container.attrs.get("Config", {}).get("Cmd") or []if isinstance(entrypoint, str):entrypoint = [entrypoint]- image_tags = container.image.tags- image_uri = image_tags[0] if image_tags else container.image.short_id+ # The image reference the container was created with. Do not look the+ # image up via container.image: it may have been removed since.+ image_uri = container.attrs.get("Config", {}).get("Image")snapshot_id = labels.get(SANDBOX_SNAPSHOT_ID_LABEL)image_spec = None if snapshot_id else ImageSpec(uri=image_uri)diff --git a/server/tests/test_docker_service.py b/server/tests/test_docker_service.pyindex 92a97affd..d89b49dce 100644--- a/server/tests/test_docker_service.py+++ b/server/tests/test_docker_service.py@@ -17,9 +17,9 @@ import jsonimport osfrom datetime import datetime, timedelta, timezonefrom typing import Any, cast-from unittest.mock import MagicMock, patch+from unittest.mock import MagicMock, PropertyMock, patch-from docker.errors import DockerException, NotFound as DockerNotFound+from docker.errors import DockerException, ImageNotFound, NotFound as DockerNotFoundimport pytestfrom fastapi import HTTPException, statusfrom pydantic import SecretStr, ValidationError@@ -2598,6 +2598,7 @@ def test_container_to_sandbox_returns_extensions(mock_docker):"opensandbox.io/access-renew-extend-seconds": "1800",},"Cmd": ["python"],+ "Image": "python:3.11",},"Created": "2025-01-01T00:00:00Z","State": {@@ -2607,7 +2608,6 @@ def test_container_to_sandbox_returns_extensions(mock_docker):"ExitCode": 0,},}- container.image = MagicMock(tags=["python:3.11"], short_id="sha-img")sandbox = service._container_to_sandbox(container)@@ -2627,7 +2627,11 @@ def test_container_to_sandbox_keeps_docker_times_with_trimmed_fraction(mock_dockservice = DockerSandboxService(config=_app_config())container = MagicMock()container.attrs = {- "Config": {"Labels": {SANDBOX_ID_LABEL: "sandbox-frac"}, "Cmd": ["python"]},+ "Config": {+ "Labels": {SANDBOX_ID_LABEL: "sandbox-frac"},+ "Cmd": ["python"],+ "Image": "python:3.11",+ },"Created": "2025-01-01T00:00:00.12345Z","State": {"Status": "exited",@@ -2636,7 +2640,6 @@ def test_container_to_sandbox_keeps_docker_times_with_trimmed_fraction(mock_dock"ExitCode": 0,},}- container.image = MagicMock(tags=["python:3.11"], short_id="sha-img")sandbox = service._container_to_sandbox(container)@@ -3242,7 +3245,6 @@ def test_container_snapshot_restore_reports_snapshot_id_without_image(mock_docke"ExitCode": 0,},}- container.image = MagicMock(tags=["opensandbox-snapshots:snap-001"], short_id="sha-image")sandbox = service._container_to_sandbox(container)@@ -4909,12 +4911,13 @@ def _mock_container(extra_labels: dict | None = None,) -> MagicMock:"""Build a MagicMock container matching what ``_container_to_sandbox``- expects to read from ``container.attrs`` and ``container.image``."""+ expects to read from ``container.attrs``."""labels = {SANDBOX_ID_LABEL: sandbox_id, **(extra_labels or {})}container = MagicMock()container.attrs = {"Created": "2024-01-01T00:00:00Z","Config": {+ "Image": image,"Labels": labels,"Cmd": entrypoint if entrypoint is not None else ["python", "-V"],},@@ -4928,9 +4931,6 @@ def _mock_container(},}container.status = docker_status- container.image.tags = [image]- container.image.short_id = f"sha256:{sandbox_id}"- container.image.attrs = {}return container@@ -4974,7 +4974,7 @@ def test_list_sandboxes_uses_low_level_summary_endpoint(mock_docker):item = response.items[0]assert item.id == "sbx-1"assert item.status.state == "Running"- # Full fidelity: entrypoint from Config.Cmd, image from image.tags.+ # Full fidelity: entrypoint from Config.Cmd, image from Config.Image.assert item.entrypoint == ["python", "app.py"]assert item.image is not Noneassert item.image.uri == "python:3.11"@@ -5014,6 +5014,30 @@ def test_list_sandboxes_skips_concurrently_deleted_sandbox(mock_docker):assert ids == {"sbx-alive"}+@patch("opensandbox_server.services.docker.docker_service.docker")+def test_list_sandboxes_reports_image_of_container_whose_image_was_removed(mock_docker):+ """An image can be removed (``docker rmi -f``) while a container still+ uses it. Listing must not look the image up: that raises ImageNotFound+ and fails the whole request. The image comes from the container config.+ """+ mock_client = MagicMock()+ mock_client.containers.list.return_value = []+ container = _mock_container("sbx-1", image="python:3.11")+ type(container).image = PropertyMock(side_effect=ImageNotFound("no such image"))+ _wire_list_mocks(mock_client, [container])+ mock_docker.from_env.return_value = mock_client++ service = DockerSandboxService(config=_app_config())++ response = service.list_sandboxes(+ ListSandboxesRequest(pagination=PaginationRequest(page=1, page_size=50))+ )++ (item,) = response.items+ assert item.image is not None+ assert item.image.uri == "python:3.11"++@patch("opensandbox_server.services.docker.docker_service.docker")def test_list_sandboxes_preserves_failed_and_terminated_states(mock_docker):"""list_sandboxes must distinguish successful exits (Terminated) from