Update Dockerfile

Dockerfile

@@ -48,7 +48,17 @@ http {
     include /etc/nginx/mime.types;
     default_type application/octet-stream;
     sendfile on;
-    keepalive_timeout 65;
+    keepalive_timeout 120;
+    
+    # Added buffer size configurations
+    proxy_buffer_size 128k;
+    proxy_buffers 4 256k;
+    proxy_busy_buffers_size 256k;
+    
+    # Added timeout configurations
+    proxy_connect_timeout 120s;
+    proxy_read_timeout 120s;
+    proxy_send_timeout 120s;
 
     upstream frontend {
         server 127.0.0.1:3000;
@@ -63,36 +73,43 @@ http {
         server_name _;
         client_max_body_size 100M;
         
+        # Increased buffer sizes
+        proxy_buffer_size 128k;
+        proxy_buffers 4 256k;
+        proxy_busy_buffers_size 256k;
+        
         location / {
             proxy_pass http://frontend;
             proxy_http_version 1.1;
-            proxy_set_header Upgrade "\$http_upgrade";
+            proxy_set_header Upgrade "$http_upgrade";
             proxy_set_header Connection "upgrade";
-            proxy_set_header Host "\$host";
-            proxy_cache_bypass "\$http_upgrade";
-            proxy_set_header X-Real-IP "\$remote_addr";
-            proxy_set_header X-Forwarded-For "\$proxy_add_x_forwarded_for";
-            proxy_set_header X-Forwarded-Proto "\$scheme";
+            proxy_set_header Host "$host";
+            proxy_cache_bypass "$http_upgrade";
+            proxy_set_header X-Real-IP "$remote_addr";
+            proxy_set_header X-Forwarded-For "$proxy_add_x_forwarded_for";
+            proxy_set_header X-Forwarded-Proto "$scheme";
             proxy_read_timeout 300s;
-            proxy_connect_timeout 75s;
+            proxy_connect_timeout 120s;
+            proxy_send_timeout 120s;
         }
 
         location /api {
             proxy_pass http://backend;
             proxy_http_version 1.1;
-            proxy_set_header Upgrade "\$http_upgrade";
+            proxy_set_header Upgrade "$http_upgrade";
             proxy_set_header Connection "upgrade";
-            proxy_set_header Host "\$host";
-            proxy_cache_bypass "\$http_upgrade";
-            proxy_set_header X-Real-IP "\$remote_addr";
-            proxy_set_header X-Forwarded-For "\$proxy_add_x_forwarded_for";
-            proxy_set_header X-Forwarded-Proto "\$scheme";
+            proxy_set_header Host "$host";
+            proxy_cache_bypass "$http_upgrade";
+            proxy_set_header X-Real-IP "$remote_addr";
+            proxy_set_header X-Forwarded-For "$proxy_add_x_forwarded_for";
+            proxy_set_header X-Forwarded-Proto "$scheme";
             proxy_read_timeout 300s;
-            proxy_connect_timeout 75s;
+            proxy_connect_timeout 120s;
+            proxy_send_timeout 120s;
         }
 
         access_log /var/log/nginx/access.log;
-        error_log /var/log/nginx/error.log;
+        error_log /var/log/nginx/error.log debug;
     }
 }
 EOF
@@ -173,81 +190,129 @@ ENV FLASK_APP=app.py \
 EXPOSE 7860
 
 # Create startup script
-RUN echo '#!/bin/bash\n\
-set -e\n\
-echo "===== Application Startup at $(date "+%Y-%m-%d %H:%M:%S") ====="\n\
-\n\
-# Initialize PostgreSQL database if not already initialized\n\
-if [ ! -f "$PGDATA/PG_VERSION" ]; then\n\
-    echo "Initializing PostgreSQL database..."\n\
-    initdb --username=user --pwfile=<(echo "$DB_PASSWORD") --auth=md5 --encoding=UTF8\n\
-    \n\
-    # Configure PostgreSQL\n\
-    echo "local all all trust" > "$PGDATA/pg_hba.conf"\n\
-    echo "host all all 127.0.0.1/32 md5" >> "$PGDATA/pg_hba.conf"\n\
-    echo "host all all ::1/128 md5" >> "$PGDATA/pg_hba.conf"\n\
-    echo "host all all 0.0.0.0/0 md5" >> "$PGDATA/pg_hba.conf"\n\
-    \n\
-    echo "listen_addresses = '\''*'\''" >> "$PGDATA/postgresql.conf"\n\
-    echo "max_connections = 100" >> "$PGDATA/postgresql.conf"\n\
-    echo "shared_buffers = 128MB" >> "$PGDATA/postgresql.conf"\n\
-fi\n\
-\n\
-# Start PostgreSQL with detailed logging\n\
-echo "Starting PostgreSQL server..."\n\
-pg_ctl start -D "$PGDATA" -l /var/log/postgresql/postgresql.log -o "-c logging_collector=on -c log_directory='\''/var/log/postgresql'\'' -c log_filename='\''postgresql-%Y-%m-%d_%H%M%S.log'\'' -c log_statement='\''all'\''" -w\n\
-\n\
-# Wait for PostgreSQL to start and show logs if there are issues\n\
-max_tries=30\n\
-count=0\n\
-echo "Checking database connection..."\n\
-until pg_isready -h localhost -p 5432; do\n\
-    if [ $count -eq 0 ]; then\n\
-        echo "PostgreSQL logs:"\n\
-        tail -n 50 /var/log/postgresql/postgresql.log\n\
-    fi\n\
-    echo "Waiting for database connection... (${count}/${max_tries})"\n\
-    sleep 2\n\
-    count=$((count+1))\n\
-    if [ $count -gt $max_tries ]; then\n\
-        echo "Failed to connect to database after ${max_tries} attempts"\n\
-        echo "Last 100 lines of PostgreSQL logs:"\n\
-        tail -n 100 /var/log/postgresql/postgresql.log\n\
-        exit 1\n\
-    fi\n\
-done\n\
-\n\
-# Create database if it doesn'\''t exist\n\
-if ! psql -lqt | cut -d \| -f 1 | grep -qw dify; then\n\
-    echo "Creating database dify..."\n\
-    createdb -U user dify\n\
-fi\n\
-\n\
-echo "Database connection successful"\n\
-\n\
-# Start application services\n\
-cd /app/api && poetry run python -m flask db upgrade\n\
-\n\
-# Start API server\n\
-cd /app/api && poetry run python -m gunicorn app:app \\\n\
-    --bind ${DIFY_BIND_ADDRESS:-127.0.0.1}:${DIFY_PORT:-5001} \\\n\
-    --worker-class gevent \\\n\
-    --workers 1 \\\n\
-    --timeout 300 \\\n\
-    --preload &\n\
-\n\
-# Start frontend server\n\
-cd /app/web && PORT=3000 node server.js &\n\
-\n\
-# Wait for services to be ready\n\
-echo "Waiting for services to be ready..."\n\
-sleep 10\n\
-\n\
-# Start nginx with debug logging\n\
-nginx -g "daemon off; error_log /var/log/nginx/error.log debug;" &\n\
-\n\
-wait' > /app/entrypoint.sh && \
-chmod +x /app/entrypoint.sh
+COPY <<-'EOT' /app/entrypoint.sh
+#!/bin/bash
+set -e
+echo "===== Application Startup at $(date "+%Y-%m-%d %H:%M:%S") ====="
+
+# Function to check if a service is ready
+check_service() {
+    local service=$1
+    local url=$2
+    local max_attempts=$3
+    local wait_time=$4
+    
+    echo "Checking $service..."
+    for i in $(seq 1 $max_attempts); do
+        if curl -s "$url" >/dev/null; then
+            echo "$service is ready"
+            return 0
+        fi
+        echo "Waiting for $service (attempt $i/$max_attempts)..."
+        sleep $wait_time
+    done
+    echo "$service failed to start"
+    return 1
+}
+
+# Initialize PostgreSQL database if not already initialized
+if [ ! -f "$PGDATA/PG_VERSION" ]; then
+    echo "Initializing PostgreSQL database..."
+    initdb --username=user --pwfile=<(echo "$DB_PASSWORD") --auth=md5 --encoding=UTF8
+    
+    # Configure PostgreSQL
+    echo "local all all trust" > "$PGDATA/pg_hba.conf"
+    echo "host all all 127.0.0.1/32 md5" >> "$PGDATA/pg_hba.conf"
+    echo "host all all ::1/128 md5" >> "$PGDATA/pg_hba.conf"
+    echo "host all all 0.0.0.0/0 md5" >> "$PGDATA/pg_hba.conf"
+    
+    echo "listen_addresses = '*'" >> "$PGDATA/postgresql.conf"
+    echo "max_connections = 100" >> "$PGDATA/postgresql.conf"
+    echo "shared_buffers = 128MB" >> "$PGDATA/postgresql.conf"
+    echo "work_mem = 16MB" >> "$PGDATA/postgresql.conf"
+    echo "maintenance_work_mem = 128MB" >> "$PGDATA/postgresql.conf"
+    echo "effective_cache_size = 512MB" >> "$PGDATA/postgresql.conf"
+fi
+
+# Start PostgreSQL with detailed logging
+echo "Starting PostgreSQL server..."
+pg_ctl start -D "$PGDATA" -l /var/log/postgresql/postgresql.log -o "-c logging_collector=on -c log_directory='/var/log/postgresql' -c log_filename='postgresql-%Y-%m-%d_%H%M%S.log' -c log_statement='all'" -w
+
+# Wait for PostgreSQL to start and show logs if there are issues
+max_tries=30
+count=0
+echo "Checking database connection..."
+until pg_isready -h localhost -p 5432; do
+    if [ $count -eq 0 ]; then
+        echo "PostgreSQL logs:"
+        tail -n 50 /var/log/postgresql/postgresql.log
+    fi
+    echo "Waiting for database connection... (${count}/${max_tries})"
+    sleep 2
+    count=$((count+1))
+    if [ $count -gt $max_tries ]; then
+        echo "Failed to connect to database after ${max_tries} attempts"
+        echo "Last 100 lines of PostgreSQL logs:"
+        tail -n 100 /var/log/postgresql/postgresql.log
+        exit 1
+    fi
+done
+
+# Create database if it doesn't exist
+if ! psql -lqt | cut -d \| -f 1 | grep -qw dify; then
+    echo "Creating database dify..."
+    createdb -U user dify
+fi
+
+echo "Database connection successful"
+
+# Start application services
+cd /app/api && poetry run python -m flask db upgrade
+
+# Start API server
+cd /app/api && poetry run python -m gunicorn app:app \
+    --bind ${DIFY_BIND_ADDRESS:-127.0.0.1}:${DIFY_PORT:-5001} \
+    --worker-class gevent \
+    --workers 1 \
+    --timeout 300 \
+    --preload \
+    --access-logfile - \
+    --error-logfile - &
+
+# Wait for API to be ready
+echo "Waiting for API server to be ready..."
+check_service "API" "http://127.0.0.1:5001/api/health" 30 2
+
+# Start frontend server
+cd /app/web && PORT=3000 node server.js &
+
+# Wait for frontend to be ready
+echo "Waiting for frontend server to be ready..."
+check_service "Frontend" "http://127.0.0.1:3000" 30 2
+
+# Start nginx with debug logging
+echo "Starting nginx..."
+nginx -g "daemon off; error_log /var/log/nginx/error.log debug;" &
+
+# Monitor all processes
+while true; do
+    if ! pgrep -f "gunicorn" > /dev/null; then
+        echo "API server died"
+        exit 1
+    fi
+    if ! pgrep -f "node server.js" > /dev/null; then
+        echo "Frontend server died"
+        exit 1
+    fi
+    if ! pgrep -f "nginx" > /dev/null; then
+        echo "Nginx died"
+        exit 1
+    fi
+    sleep 30
+done
+EOT
+
+RUN chmod +x /app/entrypoint.sh
 
 WORKDIR /app