diff --git a/celerybeat-schedule-shm b/celerybeat-schedule-shm index c6cce59..09ecd86 100644 Binary files a/celerybeat-schedule-shm and b/celerybeat-schedule-shm differ diff --git a/celerybeat-schedule-wal b/celerybeat-schedule-wal index 27f09f9..34bd962 100644 Binary files a/celerybeat-schedule-wal and b/celerybeat-schedule-wal differ 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: