fix: improve database initialization and connection handling

docker/docker-compose.yaml

@@ -326,24 +326,19 @@ services:
   db:
     image: postgres:15-alpine
     restart: always
+    networks:
+      - dify_network
     environment:
-      PGUSER: ${PGUSER:-postgres}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-difyai123456}
-      POSTGRES_DB: ${POSTGRES_DB:-dify}
-      PGDATA: ${PGDATA:-/var/lib/postgresql/data/pgdata}
-    command: >
-      postgres -c 'max_connections=${POSTGRES_MAX_CONNECTIONS:-100}'
-               -c 'shared_buffers=${POSTGRES_SHARED_BUFFERS:-128MB}'
-               -c 'work_mem=${POSTGRES_WORK_MEM:-4MB}'
-               -c 'maintenance_work_mem=${POSTGRES_MAINTENANCE_WORK_MEM:-64MB}'
-               -c 'effective_cache_size=${POSTGRES_EFFECTIVE_CACHE_SIZE:-4096MB}'
+      POSTGRES_USER: ${DB_USERNAME:-postgres}
+      POSTGRES_PASSWORD: ${DB_PASSWORD:-difyai123456}
+      POSTGRES_DB: ${DB_DATABASE:-dify}
     volumes:
       - ./volumes/db/data:/var/lib/postgresql/data
     healthcheck:
-      test: ['CMD', 'pg_isready']
-      interval: 1s
-      timeout: 3s
-      retries: 30
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME:-postgres}"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
   # The redis cache.
   redis:

docker/entrypoint.sh

@@ -3,35 +3,44 @@ set -e
 
 echo "Starting Dify services..."
 
-# Set database connection variables from environment
-export PGHOST="${DB_HOST:-db}"
-export PGPORT="${DB_PORT:-5432}"
-export PGUSER="${DB_USERNAME:-postgres}"
-export PGPASSWORD="${DB_PASSWORD:-difyai123456}"
-export PGDATABASE="${DB_DATABASE:-dify}"
+# Enhanced database connection check
+check_postgres() {
+    pg_isready -h "${DB_HOST}" -p "${DB_PORT}" -U "${DB_USERNAME}" > /dev/null 2>&1
+}
 
-# Wait for PostgreSQL with proper credentials
-until pg_isready -h "$PGHOST" -p "$PGPORT" -U "$PGUSER"; do
-    echo "PostgreSQL is unavailable - sleeping"
-    sleep 2
+check_redis() {
+    redis-cli -h "${REDIS_HOST}" -p "${REDIS_PORT}" -a "${REDIS_PASSWORD}" ping > /dev/null 2>&1
+}
+
+echo "Waiting for PostgreSQL to be ready..."
+until check_postgres; do
+    echo "PostgreSQL is unavailable (host: ${DB_HOST}, port: ${DB_PORT}) - retrying..."
+    sleep 5
 done
+echo "PostgreSQL is ready!"
 
-# Wait for Redis with proper credentials
-until redis-cli -h "${REDIS_HOST:-redis}" -p "${REDIS_PORT:-6379}" \
-    -a "${REDIS_PASSWORD:-difyai123456}" ping; do
-    echo "Redis is unavailable - sleeping"
-    sleep 2
+echo "Waiting for Redis to be ready..."
+until check_redis; do
+    echo "Redis is unavailable (host: ${REDIS_HOST}, port: ${REDIS_PORT}) - retrying..."
+    sleep 5
 done
+echo "Redis is ready!"
 
 # Initialize database if needed
 cd /app/api
 if [ ! -f ".db_initialized" ]; then
-    echo "Initializing database..."
+    echo "Running database migrations..."
     flask db upgrade
-    touch .db_initialized
+    if [ $? -eq 0 ]; then
+        touch .db_initialized
+        echo "Database initialization completed successfully"
+    else
+        echo "Database initialization failed"
+        exit 1
+    fi
 fi
 
-# Start API server in background
+# Start services
 echo "Starting API server on port 7860..."
 gunicorn --bind 0.0.0.0:7860 \
     --workers 1 \