Update Dockerfile

Dockerfile

@@ -8,7 +8,6 @@ ENV POETRY_VERSION=1.8.4 \
     POETRY_VIRTUALENVS_IN_PROJECT=true \
     POETRY_CACHE_DIR=/tmp/poetry_cache \
     PYTHONDONTWRITEBYTECODE=1 \
-    PATH=/usr/lib/postgresql/15/bin:$PATH \
     LANG=en_US.UTF-8 \
     LANGUAGE=en_US:en \
     LC_ALL=en_US.UTF-8
@@ -27,19 +26,18 @@ RUN apt-get update && apt-get install -y \
     libmpc-dev \
     nodejs \
     npm \
-    postgresql-15 \
-    postgresql-contrib-15 \
-    postgresql-client-15 \
+    postgresql \
+    postgresql-contrib \
     locales \
     && rm -rf /var/lib/apt/lists/* \
     && pip install --no-cache-dir "poetry==${POETRY_VERSION}" \
     && sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen \
     && locale-gen
 
-# Set up PostgreSQL directories and permissions
-RUN mkdir -p /home/user/postgresql/data /home/user/postgresql/logs && \
-    chown -R user:user /home/user/postgresql && \
-    chmod 700 /home/user/postgresql/data
+# Set up PostgreSQL directories with standard locations
+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
 
 # Create application directories
 RUN mkdir -p /app/api /app/web /data/storage && \
@@ -52,7 +50,7 @@ USER user
 # Set environment for user
 ENV HOME=/home/user \
     PATH=/usr/lib/postgresql/15/bin:/home/user/.local/bin:$PATH \
-    PGDATA=/home/user/postgresql/data
+    PGDATA=/var/lib/postgresql/data
 
 # Pull official images
 FROM langgenius/dify-web:latest AS web
@@ -104,41 +102,54 @@ 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 --auth=trust --no-locale --encoding=UTF8\n\
+    initdb --username=user --pwfile=<(echo "$DB_PASSWORD") --auth=md5 --encoding=UTF8\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\
+    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\n\
-pg_ctl start -D $PGDATA -l /home/user/postgresql/logs/postgresql.log -w\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\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\
-# 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\
+# 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\