Update Dockerfile

Dockerfile

@@ -9,29 +9,10 @@ ENV POETRY_VERSION=1.8.4 \
     POETRY_CACHE_DIR=/tmp/poetry_cache \
     PYTHONDONTWRITEBYTECODE=1
 
-# Install PostgreSQL first to ensure postgres group exists
-RUN apt-get update && apt-get install -y \
-    postgresql \
-    postgresql-contrib \
-    && rm -rf /var/lib/apt/lists/*
-
-# Create users with specific GID/UID for HF Spaces compatibility
-RUN groupadd -g 1000 user && \
-    useradd -m -u 1000 -g user user && \
-    usermod -aG postgres user
-
-# Set up directories with correct permissions
-RUN mkdir -p /var/run/postgresql /var/lib/postgresql/data /var/log/postgresql && \
-    chown -R postgres:postgres /var/run/postgresql /var/lib/postgresql/data /var/log/postgresql && \
-    chmod 2777 /var/run/postgresql && \
-    chmod 700 /var/lib/postgresql/data
-
-# Create application directories
-RUN mkdir -p /app/api /app/web /data/storage && \
-    chown -R user:user /app /data && \
-    chmod 777 /data /app
+# Create user first (HF Spaces requirement)
+RUN useradd -m -u 1000 user
 
-# Install remaining system dependencies
+# Install system dependencies
 RUN apt-get update && apt-get install -y \
     curl \
     git \
@@ -42,15 +23,20 @@ RUN apt-get update && apt-get install -y \
     libmpc-dev \
     nodejs \
     npm \
+    postgresql \
+    postgresql-contrib \
     && rm -rf /var/lib/apt/lists/* \
     && pip install --no-cache-dir "poetry==${POETRY_VERSION}"
 
-# Initialize PostgreSQL database as postgres user
-USER postgres
-RUN /usr/lib/postgresql/15/bin/initdb -D /var/lib/postgresql/data && \
-    echo "host all  all    0.0.0.0/0  md5" >> /var/lib/postgresql/data/pg_hba.conf && \
-    echo "listen_addresses='*'" >> /var/lib/postgresql/data/postgresql.conf && \
-    echo "unix_socket_directories = '/var/run/postgresql'" >> /var/lib/postgresql/data/postgresql.conf
+# 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
+
+# Create application directories
+RUN mkdir -p /app/api /app/web /data/storage && \
+    chown -R user:user /app /data && \
+    chmod 777 /data /app
 
 # Switch to user for remaining operations
 USER user
@@ -68,10 +54,9 @@ FROM base
 
 # Set up directory structure
 WORKDIR /app
-RUN mkdir -p api web /data/storage && \
-    chown -R user:user /app /data
+RUN mkdir -p api web /data/storage
 
-# Copy from official images with correct ownership
+# Copy from official images
 COPY --from=web --chown=user:user /app/web /app/web/
 COPY --from=api --chown=user:user /app/api /app/api/
 
@@ -98,40 +83,35 @@ ENV FLASK_APP=app.py \
     APP_WEB_URL=https://${SPACE_ID}.hf.space \
     DIFY_PORT=7860 \
     DIFY_BIND_ADDRESS=0.0.0.0 \
-    DB_USERNAME=${POSTGRES_USER:-postgres} \
-    DB_PASSWORD=${POSTGRES_PASSWORD:-difyai123456} \
-    DB_HOST=${POSTGRES_HOST:-localhost} \
-    DB_PORT=${POSTGRES_PORT:-5432} \
-    DB_DATABASE=${POSTGRES_DB:-dify} \
-    REDIS_HOST=localhost \
-    REDIS_PORT=6379 \
-    REDIS_PASSWORD=difyai123456 \
-    CELERY_BROKER_URL=amqp://guest:guest@localhost:5672// \
-    CELERY_RESULT_BACKEND=redis://localhost:6379/0 \
+    DB_USERNAME=user \
+    DB_PASSWORD=difyai123456 \
+    DB_HOST=localhost \
+    DB_PORT=5432 \
+    DB_DATABASE=dify \
     PYTHONPATH=/app/api \
     STORAGE_PATH=/data/storage
 
-EXPOSE 7860 3000
+EXPOSE 7860
 
-# Create startup script with connection retries
+# Create startup script
 RUN echo '#!/bin/bash\n\
 echo "===== Application Startup at $(date "+%Y-%m-%d %H:%M:%S") ====="\n\
 \n\
-# Ensure PostgreSQL directories have correct permissions\n\
-mkdir -p /var/log/postgresql /var/run/postgresql\n\
-chown -R postgres:postgres /var/log/postgresql /var/run/postgresql /var/lib/postgresql/data\n\
-chmod 2777 /var/run/postgresql\n\
-chmod 700 /var/lib/postgresql/data\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\
 \n\
-# Start PostgreSQL as postgres user without using su command\n\
-runuser -u postgres -- /usr/lib/postgresql/15/bin/pg_ctl -D /var/lib/postgresql/data \
-    -l /var/log/postgresql/postgresql.log start\n\
+# Start PostgreSQL\n\
+pg_ctl -D $HOME/postgresql/data -l $HOME/postgresql/logfile start\n\
 \n\
 # Wait for PostgreSQL to start\n\
 max_tries=30\n\
 count=0\n\
 echo "Checking database connection..."\n\
-until PGPASSWORD="${DB_PASSWORD}" psql -h localhost -p 5432 -U postgres -c "SELECT 1" > /dev/null 2>&1; do\n\
+until psql -h localhost -p 5432 -U user -d postgres -c "SELECT 1" > /dev/null 2>&1; do\n\
     echo "Waiting for database connection... (${count}/${max_tries})"\n\
     sleep 2\n\
     count=$((count+1))\n\
@@ -141,11 +121,8 @@ until PGPASSWORD="${DB_PASSWORD}" psql -h localhost -p 5432 -U postgres -c "SELE
     fi\n\
 done\n\
 \n\
-# Create database and set up permissions\n\
-PGPASSWORD="${DB_PASSWORD}" psql -h localhost -p 5432 -U postgres <<-EOSQL\n\
-    CREATE DATABASE ${DB_DATABASE} WITH OWNER ${DB_USERNAME};\n\
-    ALTER USER ${DB_USERNAME} WITH PASSWORD '\''${DB_PASSWORD}'\'';\n\
-EOSQL\n\
+# Create database\n\
+createdb ${DB_DATABASE}\n\
 \n\
 echo "Database connection successful"\n\
 \n\