Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions tests/tools/test_file_tools_container_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ def _make_env_config(**overrides):
"docker_volumes": [],
"docker_mount_cwd_to_workspace": True,
"docker_forward_env": ["MY_SECRET", "API_KEY"],
"docker_env": {"APP_ENV": "test"},
"docker_extra_args": ["--cap-drop=ALL"],
"docker_persist_across_processes": False,
"docker_orphan_reaper": False,
}
base.update(overrides)
return base
Expand Down Expand Up @@ -73,6 +77,33 @@ def test_docker_forward_env_defaults_to_empty_list(self):
cc = self._run(cfg, "t4").get("container_config", {})
assert cc.get("docker_forward_env") == []

def test_docker_policy_fields_passed(self):
"""Docker policy values are forwarded to container_config unchanged."""
cc = self._run(_make_env_config(), "t5").get("container_config", {})

assert cc["docker_env"] == {"APP_ENV": "test"}
assert cc["docker_extra_args"] == ["--cap-drop=ALL"]
assert cc["docker_persist_across_processes"] is False
assert cc["docker_orphan_reaper"] is False

def test_docker_policy_fields_use_terminal_defaults(self):
"""Docker policy fields preserve terminal_tool defaults when absent."""
cfg = _make_env_config()
for key in (
"docker_env",
"docker_extra_args",
"docker_persist_across_processes",
"docker_orphan_reaper",
):
del cfg[key]

cc = self._run(cfg, "t6").get("container_config", {})

assert cc["docker_env"] == {}
assert cc["docker_extra_args"] == []
assert cc["docker_persist_across_processes"] is True
assert cc["docker_orphan_reaper"] is True

def test_cwd_only_raw_task_override_reaches_file_environment(self):
"""CWD-only task overrides collapse to default but must keep their cwd."""
captured = self._run(
Expand Down
4 changes: 4 additions & 0 deletions tools/file_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -1146,8 +1146,12 @@ def _get_file_ops(task_id: str = "default") -> ShellFileOperations:
"docker_volumes": config.get("docker_volumes", []),
"docker_mount_cwd_to_workspace": config.get("docker_mount_cwd_to_workspace", False),
"docker_forward_env": config.get("docker_forward_env", []),
"docker_env": config.get("docker_env", {}),
"docker_run_as_host_user": config.get("docker_run_as_host_user", False),
"docker_network": config.get("docker_network", True),
"docker_extra_args": config.get("docker_extra_args", []),
"docker_persist_across_processes": config.get("docker_persist_across_processes", True),
"docker_orphan_reaper": config.get("docker_orphan_reaper", True),
}

ssh_config = None
Expand Down