Update Dockerfile

Dockerfile

@@ -14,9 +14,6 @@ ENV POETRY_VERSION=1.8.4 \
     PORT=7860 \
     NODE_ENV=production
 
-# Create user first (HF Spaces requirement)
-RUN useradd -m -u 1000 user
-
 # Install system dependencies and set up locales
 RUN apt-get update && apt-get install -y \
     curl \
@@ -114,82 +111,18 @@ http {
 }
 EOF
 
-RUN mkdir -p /var/log/nginx && \
-    chown -R user:user /var/log/nginx && \
+# Set up directories and permissions
+RUN mkdir -p /var/log/nginx /var/run/postgresql /var/lib/postgresql/data /var/log/postgresql /app/api /app/web /data/storage && \
+    chown -R root:root /etc/nginx && \
+    chmod -R 755 /etc/nginx && \
     touch /run/nginx.pid && \
-    chown -R user:user /run/nginx.pid && \
-    chown -R user:user /var/lib/nginx && \
+    chown -R root:root /run/nginx.pid && \
     chmod -R 755 /var/lib/nginx && \
-    chmod -R 755 /etc/nginx && \
-    chmod -R 777 /run
-
-# 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 && \
-    chown -R user:user /app /data && \
+    chmod -R 777 /run && \
+    chmod 700 /var/lib/postgresql/data && \
     chmod 777 /data /app
 
-# Switch to user for remaining operations
-USER user
-
-# Set environment for user
-ENV HOME=/home/user \
-    PATH=/usr/lib/postgresql/15/bin:/home/user/.local/bin:$PATH \
-    PGDATA=/var/lib/postgresql/data
-
-# Pull official images
-FROM langgenius/dify-web:latest AS web
-FROM langgenius/dify-api:latest AS api
-
-# Final stage
-FROM base
-
-# Set up directory structure
-WORKDIR /app
-RUN mkdir -p api web /data/storage
-
-# Copy from official images
-COPY --from=web --chown=user:user /app/web /app/web/
-COPY --from=api --chown=user:user /app/api /app/api/
-
-# Install API dependencies using Poetry
-WORKDIR /app/api
-COPY --from=api --chown=user /app/api/pyproject.toml /app/api/poetry.lock /app/api/poetry.toml ./
-RUN poetry install --no-root --no-dev
-
-# Create symlink for persistent storage
-RUN ln -s /data/storage /app/api/storage
-
-# Set environment variables
-ENV FLASK_APP=app.py \
-    EDITION=SELF_HOSTED \
-    DEPLOY_ENV=PRODUCTION \
-    MODE=api \
-    LOG_LEVEL=INFO \
-    DEBUG=false \
-    FLASK_DEBUG=false \
-    SECRET_KEY=sk-9f73s3ljTXVcMT3Blb3ljTqtsKiGHXVcMT3BlbkFJLK7U \
-    CONSOLE_API_URL=https://${SPACE_ID}.hf.space \
-    CONSOLE_WEB_URL=https://${SPACE_ID}.hf.space \
-    SERVICE_API_URL=https://${SPACE_ID}.hf.space \
-    APP_WEB_URL=https://${SPACE_ID}.hf.space \
-    DIFY_PORT=5001 \
-    DIFY_BIND_ADDRESS=127.0.0.1 \
-    DB_USERNAME=user \
-    DB_PASSWORD=difyai123456 \
-    DB_HOST=localhost \
-    DB_PORT=5432 \
-    DB_DATABASE=dify \
-    PYTHONPATH=/app/api \
-    STORAGE_PATH=/data/storage
-
-EXPOSE 7860
-
-# Create startup script
+# Create and configure entrypoint script
 COPY <<-'EOT' /app/entrypoint.sh
 #!/bin/bash
 set -e
@@ -312,7 +245,69 @@ while true; do
 done
 EOT
 
-RUN chmod +x /app/entrypoint.sh
+# Set permissions for entrypoint script
+RUN chmod +x /app/entrypoint.sh && \
+    chown user:user /app/entrypoint.sh
+
+# Create user after setting up all files and permissions
+RUN useradd -m -u 1000 user && \
+    chown -R user:user /var/run/postgresql /var/lib/postgresql/data /var/log/postgresql /app /data /var/log/nginx
+
+# Switch to user for remaining operations
+USER user
+
+# Set environment for user
+ENV HOME=/home/user \
+    PATH=/usr/lib/postgresql/15/bin:/home/user/.local/bin:$PATH \
+    PGDATA=/var/lib/postgresql/data
+
+# Pull official images
+FROM langgenius/dify-web:latest AS web
+FROM langgenius/dify-api:latest AS api
+
+# Final stage
+FROM base
+
+# Set up directory structure
+WORKDIR /app
+RUN mkdir -p api web /data/storage
+
+# Copy from official images
+COPY --from=web --chown=user:user /app/web /app/web/
+COPY --from=api --chown=user:user /app/api /app/api/
+
+# Install API dependencies using Poetry
+WORKDIR /app/api
+COPY --from=api --chown=user /app/api/pyproject.toml /app/api/poetry.lock /app/api/poetry.toml ./
+RUN poetry install --no-root --no-dev
+
+# Create symlink for persistent storage
+RUN ln -s /data/storage /app/api/storage
+
+# Set environment variables
+ENV FLASK_APP=app.py \
+    EDITION=SELF_HOSTED \
+    DEPLOY_ENV=PRODUCTION \
+    MODE=api \
+    LOG_LEVEL=INFO \
+    DEBUG=false \
+    FLASK_DEBUG=false \
+    SECRET_KEY=sk-9f73s3ljTXVcMT3Blb3ljTqtsKiGHXVcMT3BlbkFJLK7U \
+    CONSOLE_API_URL=https://${SPACE_ID}.hf.space \
+    CONSOLE_WEB_URL=https://${SPACE_ID}.hf.space \
+    SERVICE_API_URL=https://${SPACE_ID}.hf.space \
+    APP_WEB_URL=https://${SPACE_ID}.hf.space \
+    DIFY_PORT=5001 \
+    DIFY_BIND_ADDRESS=127.0.0.1 \
+    DB_USERNAME=user \
+    DB_PASSWORD=difyai123456 \
+    DB_HOST=localhost \
+    DB_PORT=5432 \
+    DB_DATABASE=dify \
+    PYTHONPATH=/app/api \
+    STORAGE_PATH=/data/storage
+
+EXPOSE 7860
 
 WORKDIR /app