From bc57fa06190b9dc0ffccece353498dcf606fddae Mon Sep 17 00:00:00 2001
From: kurokobo <kuro664@gmail.com>
Date: Sun, 13 Apr 2025 11:21:56 +0900
Subject: [PATCH] fix: start the plugin daemon after the database has become
 healthy (#17928)

---
 docker/docker-compose-template.yaml | 7 ++++---
 docker/docker-compose.yaml          | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docker/docker-compose-template.yaml b/docker/docker-compose-template.yaml
index ef58bf99f3..81314421a8 100644
--- a/docker/docker-compose-template.yaml
+++ b/docker/docker-compose-template.yaml
@@ -90,10 +90,10 @@ services:
     volumes:
       - ./volumes/db/data:/var/lib/postgresql/data
     healthcheck:
-      test: [ 'CMD', 'pg_isready' ]
+      test: [ 'CMD', 'pg_isready', '-h', 'db', '-U', '${PGUSER:-postgres}', '-d', '${POSTGRES_DB:-dify}' ]
       interval: 1s
       timeout: 3s
-      retries: 30
+      retries: 60
 
   # The redis cache.
   redis:
@@ -175,7 +175,8 @@ services:
     volumes:
       - ./volumes/plugin_daemon:/app/storage
     depends_on:
-      - db
+      db:
+        condition: service_healthy
 
   # ssrf_proxy server
   # for more information, please refer to
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 305cf22b20..720b604f7f 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -558,10 +558,10 @@ services:
     volumes:
       - ./volumes/db/data:/var/lib/postgresql/data
     healthcheck:
-      test: [ 'CMD', 'pg_isready' ]
+      test: [ 'CMD', 'pg_isready', '-h', 'db', '-U', '${PGUSER:-postgres}', '-d', '${POSTGRES_DB:-dify}' ]
       interval: 1s
       timeout: 3s
-      retries: 30
+      retries: 60
 
   # The redis cache.
   redis:
@@ -643,7 +643,8 @@ services:
     volumes:
       - ./volumes/plugin_daemon:/app/storage
     depends_on:
-      - db
+      db:
+        condition: service_healthy
 
   # ssrf_proxy server
   # for more information, please refer to