diff --git a/celerybeat-schedule-shm b/celerybeat-schedule-shm index 09ecd86..1066fc0 100644 Binary files a/celerybeat-schedule-shm and b/celerybeat-schedule-shm differ diff --git a/celerybeat-schedule-wal b/celerybeat-schedule-wal index 34bd962..e66321a 100644 Binary files a/celerybeat-schedule-wal and b/celerybeat-schedule-wal differ diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 1220ac1..c5ab9fa 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -8,11 +8,13 @@ services: POSTGRES_USER: ${POSTGRES_USER:-postgres} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres} POSTGRES_DB: ${POSTGRES_DB:-flower} - # 仅绑定到本机,避免把数据库暴露到公网 ports: - - "127.0.0.1:${POSTGRES_PORT:-5432}:5432" + - "5432:5432" volumes: - db_data:/var/lib/postgresql/data + dns: + - 8.8.8.8 + - 8.8.4.4 healthcheck: test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-postgres}"] interval: 5s @@ -25,14 +27,6 @@ services: image: pgbouncer/pgbouncer:latest container_name: pgbouncer # 配置文件已包含所有配置,环境变量仅作为备用 - environment: - DATABASES_HOST: postgres - DATABASES_PORT: "${POSTGRES_PORT:-5432}" - DATABASES_USER: ${POSTGRES_USER:-postgres} - DATABASES_PASSWORD: ${POSTGRES_PASSWORD:-postgres} - DATABASES_DBNAME: ${POSTGRES_DB:-flower} - ports: - - "${PGBOUNCER_PORT:-6432}:6432" volumes: - ./pgbouncer/pgbouncer.ini:/etc/pgbouncer/pgbouncer.ini # 确保 postgres 完全启动后再启动 pgbouncer @@ -41,9 +35,8 @@ services: condition: service_healthy # DNS 配置:使用 Docker 内置 DNS,并添加 DNS 搜索域 dns: - - 127.0.0.11 # Docker 内置 DNS - dns_search: - - . # 当前网络域 + - 8.8.8.8 + - 8.8.4.4 restart: unless-stopped redis: