auto-create sandbox dirs and switch to host socket compose
This commit is contained in:
parent
06271db003
commit
d4434a0afe
3 changed files with 15 additions and 34 deletions
|
|
@ -1,5 +1,6 @@
|
|||
import asyncio
|
||||
from collections.abc import Awaitable, Callable
|
||||
from pathlib import Path
|
||||
|
||||
from docker.errors import NotFound
|
||||
from fastapi import FastAPI
|
||||
|
|
@ -61,6 +62,12 @@ def _ensure_sandbox_network(container: AppContainer) -> None:
|
|||
)
|
||||
|
||||
|
||||
def _ensure_sandbox_dirs(container: AppContainer) -> None:
|
||||
cfg = container.config.sandbox
|
||||
for path_str in (cfg.dependencies_host_path, cfg.lambda_tools_host_path):
|
||||
Path(path_str).mkdir(parents=True, exist_ok=True)
|
||||
|
||||
|
||||
def _build_startup_handler(
|
||||
app: FastAPI,
|
||||
container: AppContainer,
|
||||
|
|
@ -71,6 +78,7 @@ def _build_startup_handler(
|
|||
return
|
||||
|
||||
await asyncio.to_thread(_ensure_sandbox_network, container)
|
||||
await asyncio.to_thread(_ensure_sandbox_dirs, container)
|
||||
await asyncio.to_thread(container.sandbox_reconciler.execute)
|
||||
|
||||
stop_event = asyncio.Event()
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ otel:
|
|||
metric_export_interval: 1000
|
||||
|
||||
docker:
|
||||
base_url: tcp://docker-engine:2375
|
||||
base_url: unix:///var/run/docker.sock
|
||||
|
||||
sandbox:
|
||||
image: nginx:1.27-alpine
|
||||
|
|
@ -33,9 +33,9 @@ sandbox:
|
|||
agent_service_port: 8000
|
||||
ttl_seconds: 300
|
||||
cleanup_interval_seconds: 60
|
||||
chats_root: /var/lib/master-sandbox/chats
|
||||
dependencies_host_path: /var/lib/master-dependencies
|
||||
lambda_tools_host_path: /var/lib/master-lambda-tools
|
||||
chats_root: /tmp/master-sandbox/chats
|
||||
dependencies_host_path: /tmp/master-sandbox/dependencies
|
||||
lambda_tools_host_path: /tmp/master-sandbox/lambda-tools
|
||||
chat_mount_path: /workspace/chat
|
||||
dependencies_mount_path: /opt/dependencies
|
||||
lambda_tools_mount_path: /opt/lambda-tools
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@ services:
|
|||
target: run
|
||||
user: root
|
||||
depends_on:
|
||||
docker-engine:
|
||||
condition: service_healthy
|
||||
otel-collector:
|
||||
condition: service_started
|
||||
environment:
|
||||
|
|
@ -17,30 +15,9 @@ services:
|
|||
- '127.0.0.1:8123:8123'
|
||||
volumes:
|
||||
- ./config/docker-compose.yml:/app/config/app.yaml:ro
|
||||
- sandbox-data:/var/lib/master-sandbox
|
||||
- sandbox-dependencies:/var/lib/master-dependencies:ro
|
||||
- sandbox-tools:/var/lib/master-lambda-tools:ro
|
||||
|
||||
docker-engine:
|
||||
image: docker:28-dind
|
||||
privileged: true
|
||||
environment:
|
||||
DOCKER_TLS_CERTDIR: ''
|
||||
command:
|
||||
- --host=tcp://0.0.0.0:2375
|
||||
healthcheck:
|
||||
test:
|
||||
- CMD
|
||||
- docker
|
||||
- info
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 12
|
||||
volumes:
|
||||
- docker-data:/var/lib/docker
|
||||
- sandbox-data:/var/lib/master-sandbox
|
||||
- sandbox-dependencies:/var/lib/master-dependencies
|
||||
- sandbox-tools:/var/lib/master-lambda-tools
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
- /tmp/master-sandbox:/tmp/master-sandbox
|
||||
- /tmp/master-volume:/tmp/master-volume
|
||||
|
||||
otel-collector:
|
||||
image: grafana/otel-lgtm:latest
|
||||
|
|
@ -50,8 +27,4 @@ services:
|
|||
- lgtm-data:/data
|
||||
|
||||
volumes:
|
||||
docker-data:
|
||||
lgtm-data:
|
||||
sandbox-data:
|
||||
sandbox-dependencies:
|
||||
sandbox-tools:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue