Update Dockerfile

Dockerfile

@@ -7,7 +7,8 @@ ENV POETRY_VERSION=1.8.4 \
     POETRY_VIRTUALENVS_CREATE=true \
     POETRY_VIRTUALENVS_IN_PROJECT=true \
     POETRY_CACHE_DIR=/tmp/poetry_cache \
-    PYTHONDONTWRITEBYTECODE=1
+    PYTHONDONTWRITEBYTECODE=1 \
+    PATH=/usr/lib/postgresql/15/bin:$PATH
 
 # Create user first (HF Spaces requirement)
 RUN useradd -m -u 1000 user
@@ -23,15 +24,16 @@ RUN apt-get update && apt-get install -y \
     libmpc-dev \
     nodejs \
     npm \
-    postgresql \
-    postgresql-contrib \
+    postgresql-15 \
+    postgresql-contrib-15 \
+    postgresql-client-15 \
     && rm -rf /var/lib/apt/lists/* \
     && pip install --no-cache-dir "poetry==${POETRY_VERSION}"
 
 # Set up PostgreSQL directories and permissions
-RUN mkdir -p /var/run/postgresql /var/lib/postgresql/data /var/log/postgresql && \
-    chown -R user:user /var/run/postgresql /var/lib/postgresql/data /var/log/postgresql && \
-    chmod 700 /var/lib/postgresql/data
+RUN mkdir -p /home/user/postgresql/data /home/user/postgresql/logs && \
+    chown -R user:user /home/user/postgresql && \
+    chmod 700 /home/user/postgresql/data
 
 # Create application directories
 RUN mkdir -p /app/api /app/web /data/storage && \
@@ -43,7 +45,8 @@ USER user
 
 # Set environment for user
 ENV HOME=/home/user \
-    PATH=/home/user/.local/bin:$PATH
+    PATH=/usr/lib/postgresql/15/bin:/home/user/.local/bin:$PATH \
+    PGDATA=/home/user/postgresql/data
 
 # Pull official images
 FROM langgenius/dify-web:latest AS web
@@ -97,21 +100,24 @@ EXPOSE 7860
 RUN echo '#!/bin/bash\n\
 echo "===== Application Startup at $(date "+%Y-%m-%d %H:%M:%S") ====="\n\
 \n\
-# Initialize PostgreSQL database\n\
-initdb -D $HOME/postgresql/data\n\
-\n\
-# Configure PostgreSQL\n\
-echo "host all all 0.0.0.0/0 md5" >> $HOME/postgresql/data/pg_hba.conf\n\
-echo "listen_addresses='\''*'\''" >> $HOME/postgresql/data/postgresql.conf\n\
+# Initialize PostgreSQL database if not already initialized\n\
+if [ ! -f "$PGDATA/PG_VERSION" ]; then\n\
+    echo "Initializing PostgreSQL database..."\n\
+    initdb --auth=trust --encoding=UTF8 --locale=en_US.UTF-8\n\
+    \n\
+    # Configure PostgreSQL\n\
+    echo "host all all 0.0.0.0/0 md5" >> $PGDATA/pg_hba.conf\n\
+    echo "listen_addresses = '\''*'\''" >> $PGDATA/postgresql.conf\n\
+fi\n\
 \n\
 # Start PostgreSQL\n\
-pg_ctl -D $HOME/postgresql/data -l $HOME/postgresql/logfile start\n\
+pg_ctl start -D $PGDATA -l /home/user/postgresql/logs/postgresql.log\n\
 \n\
 # Wait for PostgreSQL to start\n\
 max_tries=30\n\
 count=0\n\
 echo "Checking database connection..."\n\
-until psql -h localhost -p 5432 -U user -d postgres -c "SELECT 1" > /dev/null 2>&1; do\n\
+until pg_isready -h localhost -p 5432; do\n\
     echo "Waiting for database connection... (${count}/${max_tries})"\n\
     sleep 2\n\
     count=$((count+1))\n\
@@ -121,19 +127,23 @@ until psql -h localhost -p 5432 -U user -d postgres -c "SELECT 1" > /dev/null 2>
     fi\n\
 done\n\
 \n\
-# Create database\n\
-createdb ${DB_DATABASE}\n\
+# Set up database user and permissions\n\
+psql -v ON_ERROR_STOP=1 --username user --dbname postgres <<-EOSQL\n\
+    ALTER USER user WITH PASSWORD '\''difyai123456'\'';\n\
+    CREATE DATABASE dify;\n\
+    GRANT ALL PRIVILEGES ON DATABASE dify TO user;\n\
+EOSQL\n\
 \n\
 echo "Database connection successful"\n\
 \n\
 # Start application services\n\
 cd /app/api && poetry run python -m flask db upgrade\n\
 \n\
-cd /app/api && poetry run python -m gunicorn app:app \
-    --bind ${DIFY_BIND_ADDRESS:-0.0.0.0}:${DIFY_PORT:-7860} \
-    --worker-class gevent \
-    --workers 1 \
-    --timeout 300 \
+cd /app/api && poetry run python -m gunicorn app:app \\\n\
+    --bind ${DIFY_BIND_ADDRESS:-0.0.0.0}:${DIFY_PORT:-7860} \\\n\
+    --worker-class gevent \\\n\
+    --workers 1 \\\n\
+    --timeout 300 \\\n\
     --preload &\n\
 \n\
 cd /app/web && node server.js &\n\