From 57b5a2b4d11a59df394d0965d2ffd6afb44bfc95 Mon Sep 17 00:00:00 2001
From: colaftc <colaftc@gmail.com>
Date: Wed, 24 Dec 2025 23:18:07 +0800
Subject: [PATCH] giveup3

---
 celerybeat-schedule-shm | Bin 32768 -> 32768 bytes
 celerybeat-schedule-wal | Bin 2982912 -> 2991152 bytes
 docker-compose.dev.yml  |  15 ++++++++++++++-
 docker-compose.prod.yml |  15 ++++++++++++++-
 docker-compose.yml      |  15 ++++++++++++++-
 5 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/celerybeat-schedule-shm b/celerybeat-schedule-shm
index c6cce59d6b6a7a73857bef31549367b1b86c5a93..09ecd864c99bc25baf97a5b5a34b18bb78535666 100644
GIT binary patch
delta 171
zcmZo@U}|V!s+V}A%K!q|j0_AwByf$1fq@ywpT+-3iot$L_~fI}TIymiotJu_v2_l3
z?@p?Eu;D-gWbS_?02SX@AIUv&0mtSW+%i_1|F~XZV!FyS`60K)=3gE__BE!>54jCY
E0Q$-|rvLx|

delta 170
zcmZo@U}|V!s+V}A%K!pdj0_AwByfd^fq@yw_p&o|Vcd1TYx2=(Ep@S%&hM3%9X7ZW
ztVODNu;D-gWbS_?02SX@AIZJ>0k@3R<PY2&oBz08VVZo&Lu2y~k82Rd2W~DC04}*X
AF#rGn

diff --git a/celerybeat-schedule-wal b/celerybeat-schedule-wal
index 27f09f9b828a502b0223dddcb47d7fde32ee9dfa..34bd9626740e7308d48ca8413bb708d6e3f507cd 100644
GIT binary patch
delta 218
zcmZqZ*v7cw#5Tr;7RDB)7UmX~7S<NF7WNj77S0x~7VZ|F7Ty-V7XB827Qq&w7U33=
z7SR^57V#E|7ReT=7U>q57TFfL7Wo#17R45&7UdR|7S$HD7WEd57R?r|7VQ?DCAuw>
z3myt^r1orf<mf*CZu^ZNs@HiK9kx$U=D)%yDbB^fz+gHhL#%B|&=lY8%o)-eJuF)K
zh6d9Q8Zo&~7unAhDgaW$v=*kuo@MgM3-dXo9`Vl#pJLCjeZmRVcl<&Q0?bNG@$qG;
NMa7x<dGYZ)cK|zRN&)}?

delta 100
zcmWN=$q~T-006*=GZBOYao>r%M~{6dL;+rENLlR6eyVTqeEkd5)HO7<w1pxav96xJ
j#K2H0Gcq=jo0^$hSXx=z*xK1UI4YD*&MvNQ?(c^mZmJ+s

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index a844733..4731551 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -12,6 +12,12 @@ services:
       - "5432:5432"
     volumes:
       - db_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 3s
+      retries: 10
+      start_period: 10s
     restart: unless-stopped
 
   pgbouncer:
@@ -28,8 +34,15 @@ services:
       - "6432:6432"
     volumes:
       - ./pgbouncer/pgbouncer.ini:/etc/pgbouncer/pgbouncer.ini
+    # 确保 postgres 完全启动后再启动 pgbouncer
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
+    # DNS 配置：使用 Docker 内置 DNS，并添加 DNS 搜索域
+    dns:
+      - 127.0.0.11  # Docker 内置 DNS
+    dns_search:
+      - .  # 当前网络域
     restart: unless-stopped
 
   pgadmin:
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 637d680..1220ac1 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -13,6 +13,12 @@ services:
       - "127.0.0.1:${POSTGRES_PORT:-5432}:5432"
     volumes:
       - db_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-postgres}"]
+      interval: 5s
+      timeout: 3s
+      retries: 10
+      start_period: 10s
     restart: unless-stopped
 
   pgbouncer:
@@ -29,8 +35,15 @@ services:
       - "${PGBOUNCER_PORT:-6432}:6432"
     volumes:
       - ./pgbouncer/pgbouncer.ini:/etc/pgbouncer/pgbouncer.ini
+    # 确保 postgres 完全启动后再启动 pgbouncer
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
+    # DNS 配置：使用 Docker 内置 DNS，并添加 DNS 搜索域
+    dns:
+      - 127.0.0.11  # Docker 内置 DNS
+    dns_search:
+      - .  # 当前网络域
     restart: unless-stopped
 
   redis:
diff --git a/docker-compose.yml b/docker-compose.yml
index 9c6b86e..9fdbc8b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,12 @@ services:
       - "5432:5432"
     volumes:
       - db_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 3s
+      retries: 10
+      start_period: 10s
     restart: unless-stopped
 
   pgbouncer:
@@ -29,8 +35,15 @@ services:
       - "6432:6432"
     volumes:
       - ./pgbouncer/pgbouncer.ini:/etc/pgbouncer/pgbouncer.ini
+    # 确保 postgres 完全启动后再启动 pgbouncer
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
+    # DNS 配置：使用 Docker 内置 DNS，并添加 DNS 搜索域
+    dns:
+      - 127.0.0.11  # Docker 内置 DNS
+    dns_search:
+      - .  # 当前网络域
     restart: unless-stopped
 
   pgadmin: