From c521d2ef365d0ba563bc9f1140c5e6af874269c5 Mon Sep 17 00:00:00 2001 From: yzbf <72718331+yzbf-lin@users.noreply.github.com> Date: Fri, 6 Feb 2026 14:02:40 +0800 Subject: [PATCH] Add log mount to docker compose (#1063) * Expose container logs via Docker Compose * Simplify Docker logs mount * Update comments --- .dockerignore | 1 + .gitignore | 1 + deploy/backend/docker-compose/.env.docker | 6 +++++- deploy/backend/supervisor/supervisord.conf | 2 +- docker-compose.yml | 4 ++++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index f6c19fe6..7148e024 100644 --- a/.dockerignore +++ b/.dockerignore @@ -10,3 +10,4 @@ venv/ .pytest_cache/ .claude/ .serena/ +.logs/ diff --git a/.gitignore b/.gitignore index 81b7630e..79de28b0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ venv/ .claude/ .serena/ .agents/ +.logs/ diff --git a/deploy/backend/docker-compose/.env.docker b/deploy/backend/docker-compose/.env.docker index a90892df..98b73af5 100644 --- a/deploy/backend/docker-compose/.env.docker +++ b/deploy/backend/docker-compose/.env.docker @@ -1,4 +1,4 @@ -# Docker Mapping +# Docker Port Mapping DOCKER_MAP_SERVER_PORT=8001 DOCKER_MAP_POSTGRES_PORT=15432 DOCKER_MAP_MYSQL_PORT=13306 @@ -15,3 +15,7 @@ DOCKER_MAP_ALLOY_HTTP_PORT=4318 DOCKER_MAP_ALLOY_UI_PORT=12345 DOCKER_MAP_TEMPO_PORT=3200 DOCKER_MAP_GRAFANA_PORT=3000 + +# Docker Log Mapping +# Production environment recommendation: /var/log/fba +DOCKER_FBA_SERVER_LOG=./logs/fba diff --git a/deploy/backend/supervisor/supervisord.conf b/deploy/backend/supervisor/supervisord.conf index c69c0ef7..591ccf8e 100644 --- a/deploy/backend/supervisor/supervisord.conf +++ b/deploy/backend/supervisor/supervisord.conf @@ -42,7 +42,7 @@ file=/tmp/supervisor.sock ; the path to the socket file ;password=123 ; default is no password (open server) [supervisord] -logfile=/var/log/supervisor/supervisord.log ; main log file; default $CWD/supervisord.log +logfile=/var/log/fba/supervisord.log ; main log file; default $CWD/supervisord.log logfile_maxbytes=50MB ; max main logfile bytes b4 rotation; default 50MB logfile_backups=10 ; # of main logfile backups; 0 means none, default 10 loglevel=info ; log level; default info; others: debug,warn,trace diff --git a/docker-compose.yml b/docker-compose.yml index 89af0a16..333a246a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,6 +42,7 @@ services: - ./deploy/backend/docker-compose/.env.server:/fba/backend/.env - fba_static:/fba/backend/app/static - fba_static_upload:/fba/backend/static/upload + - ${DOCKER_FBA_SERVER_LOG:-./logs/fba}:/var/log/fba networks: - fba_network # 如果你是 mysql 用户,应将 fba_postgres:5432 修改为 fba_mysql:3306 @@ -186,6 +187,7 @@ services: - fba_rabbitmq volumes: - ./deploy/backend/docker-compose/.env.server:/fba/backend/.env + - ${DOCKER_FBA_SERVER_LOG:-./logs/fba}:/var/log/fba networks: - fba_network command: @@ -212,6 +214,7 @@ services: - fba_celery_worker volumes: - ./deploy/backend/docker-compose/.env.server:/fba/backend/.env + - ${DOCKER_FBA_SERVER_LOG:-./logs/fba}:/var/log/fba networks: - fba_network command: @@ -240,6 +243,7 @@ services: - fba_celery_worker volumes: - ./deploy/backend/docker-compose/.env.server:/fba/backend/.env + - ${DOCKER_FBA_SERVER_LOG:-./logs/fba}:/var/log/fba networks: - fba_network command: