diff --git a/config/docker-compose.yml b/config/docker-compose.yml index ac6fae6..c55b3b2 100644 --- a/config/docker-compose.yml +++ b/config/docker-compose.yml @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index 24d5bab..c211818 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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,7 @@ 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 otel-collector: image: grafana/otel-lgtm:latest @@ -50,8 +25,4 @@ services: - lgtm-data:/data volumes: - docker-data: lgtm-data: - sandbox-data: - sandbox-dependencies: - sandbox-tools: