From c331cfa88000a352251de4f830ba99a25b0203d1 Mon Sep 17 00:00:00 2001
From: colaftc <colaftc@gmail.com>
Date: Wed, 24 Dec 2025 23:37:23 +0800
Subject: [PATCH] giveup7

---
 celerybeat-schedule-shm | Bin 32768 -> 32768 bytes
 celerybeat-schedule-wal | Bin 3015872 -> 3024112 bytes
 docker-compose.prod.yml |   8 ++++++--
 docker-compose.yml      |   8 ++++++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/celerybeat-schedule-shm b/celerybeat-schedule-shm
index 03f2e059b051f6e2ca5c55d65bcd20740c7fd9c4..a49c03e1d12d7e4306db9a801d935095d0baf3e0 100644
GIT binary patch
delta 171
zcmZo@U}|V!s+V}A%K!rTj0_AwByf+3fq@ywZ)^4Vn&l>Tbn?+?Ep@S%&d&DI3Hb-r
zHj%0xY&ehrnfo6JK*cxKS8`8Wz_IxU_aDp6e_Zb{G2LaF%*dm#`IiTfeUE7~Baem&
E0BCbJ#sB~S

delta 165
zcmZo@U}|V!s+V}A%K!p-j0_AwByfj`fq@yw|F*h&QT6%5@sp26YpIL9be0wM58dPD
z{hn0yV8ej~$lU)(04lz*zLI+r&mYUl0z4d>|G3^^n#{<fwE36E9j48UJX$6IFT*!&

diff --git a/celerybeat-schedule-wal b/celerybeat-schedule-wal
index fa00b6aa5d360445f17a16ebdee976f908aabfbf..1a52a88b2cdafea75d1faeb071703f3d5a00d86a 100644
GIT binary patch
delta 219
zcmX@mxr6b;$sLRhEsQNpEzB(}EvzkUE$l5EEu1Y}E!-_UExav!E&MG4ErKmVEy67#
zEut-AE#fT_Es`x#Ez&JAEwU|gE%Gf2Es8BlEy^t_EvhYQE$S^AEt)M_E!r(QExKFu
z4zNrQFyawpk6gQU!bRl^+bedcUgu$S+5TaI?o~z!IR*v>_bC}-ZBv4#`0ixRkk;s7
z(b6|GnEvoHll$~5MY>`9KqXAuU`m`>CZD`8pW~}XYuiyVx2)|39jfp6g<J%fm6+n=
Q%TkMqGxPJ}<9Y4?06=m~<^TWy

delta 103
zcmV~$w-tg=006-E5p&L%a|E5y;u`m{prmyhNAT|V%|r3d!%Gk;iIr7U)zmdKwX}6~
l_4Ex4jf_o9C1&OpmR8m_ws!Uoj!w=lu5Rv9naAf@#D4~nA=&@{

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 94150ea..eaf9d94 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -28,8 +28,12 @@ services:
     container_name: pgbouncer
     # 使用环境变量配置，让镜像自动生成配置文件
     environment:
-      # 数据库连接配置（格式：数据库名=host=主机 port=端口 dbname=数据库名 user=用户 password=密码）
-      DATABASES: flower=host=postgres port=${POSTGRES_PORT:-5432} dbname=${POSTGRES_DB:-flower} user=${POSTGRES_USER:-postgres} password=${POSTGRES_PASSWORD:-postgres}
+      # 数据库连接配置 - 使用单独的环境变量
+      DATABASES_HOST: postgres
+      DATABASES_PORT: "${POSTGRES_PORT:-5432}"
+      DATABASES_USER: ${POSTGRES_USER:-postgres}
+      DATABASES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
+      DATABASES_DBNAME: ${POSTGRES_DB:-flower}
       # PgBouncer 基本配置
       PGBOUNCER_LISTEN_ADDR: 0.0.0.0
       PGBOUNCER_LISTEN_PORT: 6432
diff --git a/docker-compose.yml b/docker-compose.yml
index 70d763e..c332279 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,8 +25,12 @@ services:
     container_name: pgbouncer
     # 使用环境变量配置，让镜像自动生成配置文件
     environment:
-      # 数据库连接配置（格式：数据库名=host=主机 port=端口 dbname=数据库名 user=用户 password=密码）
-      DATABASES: flower=host=postgres port=5432 dbname=flower user=postgres password=postgres
+      # 数据库连接配置 - 使用单独的环境变量
+      DATABASES_HOST: postgres
+      DATABASES_PORT: "5432"
+      DATABASES_USER: postgres
+      DATABASES_PASSWORD: postgres
+      DATABASES_DBNAME: flower
       # PgBouncer 基本配置
       PGBOUNCER_LISTEN_ADDR: 0.0.0.0
       PGBOUNCER_LISTEN_PORT: 6432