From 13d5e1c1605af2ae2d5b5cd12ec1ce207927a8a4 Mon Sep 17 00:00:00 2001 From: colaftc Date: Wed, 24 Dec 2025 23:40:13 +0800 Subject: [PATCH] giveup7 --- celerybeat-schedule-shm | Bin 32768 -> 32768 bytes celerybeat-schedule-wal | Bin 3024112 -> 3032352 bytes docker-compose.dev.yml | 3 ++- docker-compose.prod.yml | 10 ++++------ docker-compose.yml | 9 +++------ 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/celerybeat-schedule-shm b/celerybeat-schedule-shm index a49c03e1d12d7e4306db9a801d935095d0baf3e0..2daa650c4f4d0c162adfac6455737854c1442011 100644 GIT binary patch delta 170 zcmZo@U}|V!s+V}A%K!oej0_AwB=CTVfq@ywFMA!4_5Aj>S(A@OYpIL9bl$$;j(nWl z%sr&42OAC~K<55O0#Nad^^M#U7jSIi`C_^GkLx`qru$5j8F}P3|MCE`A24lZTbn?+?Ep@S%&d&DI3Hb-r zHj%0xY&ehrnfo6JK*cxKH*#<0;Q3-XS%HUR^B>oHOp^t96gL0zxW}|vkVnG=04_>2 A#sB~S diff --git a/celerybeat-schedule-wal b/celerybeat-schedule-wal index 1a52a88b2cdafea75d1faeb071703f3d5a00d86a..085bdcb7b8d1053cebeb894409bc41a125be96d9 100644 GIT binary patch delta 189 zcmV;u07C!p$+!Wain#%RgaL#Cgad>Ggaw2Kga?EOgb9QSgbRcWgbjoagb#!egb{=i zgcF1mgcXDqgcpPugc*bygd2n$gdKz)gdc<;gdv0?gd>C`ge8O~geQb3gein7ge!zB zge|l#@FbT&_aqSq+j3>v|MhvdsMsa93;{*9u`SgBmxU89wGSfz001kLXcmT)Qj|?Z r1ee+K0>21qSnGD0w%g~oV5lYT4-!QX10n)nUv_13b7^mGUtbK|&HF|! delta 103 zcmV~$*BQZJ006-6NAzB!w`dV&^l(q6FoXw2uuVpA_j-Oq{`-W7prEKEQdUt_Q`gYc n($>+{(>E|QGBy#LnweWzT3OrJ+SyAS9G#q9q^>fz_dQSk`7I(0 diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index c5e9532..9e2d409 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -25,7 +25,8 @@ services: container_name: pgbouncer # 使用环境变量配置，让镜像自动生成配置文件 environment: - # 数据库连接配置（格式：数据库名=host=主机 port=端口 dbname=数据库名 user=用户 password=密码） + # 数据库连接配置 - 使用 DATABASES 环境变量（格式：数据库名=host=主机 port=端口 dbname=数据库名 user=用户 password=密码） + # 确保密码与 PostgreSQL 容器的 POSTGRES_PASSWORD 完全一致 DATABASES: flower=host=postgres port=5432 dbname=flower user=postgres password=postgres # PgBouncer 基本配置 PGBOUNCER_LISTEN_ADDR: 0.0.0.0 diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index eaf9d94..2db3c51 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -28,12 +28,10 @@ services: 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} + # 数据库连接配置 - 使用 DATABASES 环境变量（格式：数据库名=host=主机 port=端口 dbname=数据库名 user=用户 password=密码） + # 确保密码与 PostgreSQL 容器的 POSTGRES_PASSWORD 完全一致 + # 注意：如果密码包含特殊字符，可能需要转义或使用引号 + DATABASES: flower=host=postgres port=${POSTGRES_PORT:-5432} dbname=${POSTGRES_DB:-flower} user=${POSTGRES_USER:-postgres} password=${POSTGRES_PASSWORD:-postgres} # PgBouncer 基本配置 PGBOUNCER_LISTEN_ADDR: 0.0.0.0 PGBOUNCER_LISTEN_PORT: 6432 diff --git a/docker-compose.yml b/docker-compose.yml index c332279..aa6657f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,12 +25,9 @@ services: container_name: pgbouncer # 使用环境变量配置，让镜像自动生成配置文件 environment: - # 数据库连接配置 - 使用单独的环境变量 - DATABASES_HOST: postgres - DATABASES_PORT: "5432" - DATABASES_USER: postgres - DATABASES_PASSWORD: postgres - DATABASES_DBNAME: flower + # 数据库连接配置 - 使用 DATABASES 环境变量（格式：数据库名=host=主机 port=端口 dbname=数据库名 user=用户 password=密码） + # 确保密码与 PostgreSQL 容器的 POSTGRES_PASSWORD 完全一致 + DATABASES: flower=host=postgres port=5432 dbname=flower user=postgres password=postgres # PgBouncer 基本配置 PGBOUNCER_LISTEN_ADDR: 0.0.0.0 PGBOUNCER_LISTEN_PORT: 6432