From 3129ded832145f2a581cf3310a769f5fc247496a Mon Sep 17 00:00:00 2001 From: colaftc Date: Wed, 24 Dec 2025 23:21:42 +0800 Subject: [PATCH] giveup4 --- celerybeat-schedule-shm | Bin 32768 -> 32768 bytes celerybeat-schedule-wal | Bin 2991152 -> 2999392 bytes docker-compose.prod.yml | 19 ++++++------------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/celerybeat-schedule-shm b/celerybeat-schedule-shm index 09ecd864c99bc25baf97a5b5a34b18bb78535666..1066fc0e5195df8a1b1ec5ffaefdfc0386b10a90 100644 GIT binary patch delta 173 zcmZo@U}|V!s+V}A%K!p7j0_AwByfX?fq@yw_Y&IV!|U_;{p6$3TIymioi*c5TTUvH z@XXIU4`~ delta 168 zcmZo@U}|V!s+V}A%K!q|j0_AwByf$1fq@ywpT+-3iot$L_~fI}TIymiotJu_v2_l3 z?@p?Eu;D-gWbS_?02SX@pUA!W1-FRRBp!~Ggaw2Kga?EOgb9QSgbRcWgbjoagb#!egb{=i zgcF1mgcXDqgcpPugc*bygd2n$gdKz)gdc<;gdv0?gd>C`ge8O~geQb3gein7ge!zB zv@I~ClW^e>2m<)hIUie^=eGzMCbtX$LARho57Ysd#F8zx4-WtU04S7b7KW5klubYc pm)Qahzz4DtO7HVb4Y$DPCGHOrK@bBX0$*QtWpZp#^0q#qRI^3D564+yps!1(BkXvWlvj ox`w8fwvMizzJZ~U*x1C>%-q6KVr6Y(YiIA^=p=QPy)M_sAG5n56951J 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: