Update Dockerfile

Dockerfile

@@ -1,45 +1,46 @@
 # Base Python image with correct version
 FROM python:3.12-slim-bookworm AS base
 
-WORKDIR /app/api
+# Set up environment variables according to HF guidelines
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    POETRY_VERSION=1.8.4 \
+    POETRY_HOME=/opt/poetry \
+    POETRY_CACHE_DIR=/tmp/poetry_cache \
+    POETRY_NO_INTERACTION=1 \
+    POETRY_VIRTUALENVS_IN_PROJECT=true \
+    POETRY_VIRTUALENVS_CREATE=true \
+    POETRY_REQUESTS_TIMEOUT=15
+
+# Create non-root user early (HF requirement)
+RUN useradd -m -u 1000 user
 
-# Install Poetry
-ENV POETRY_VERSION=1.8.4
-ENV POETRY_HOME=/opt/poetry
-ENV POETRY_CACHE_DIR=/tmp/poetry_cache
-ENV POETRY_NO_INTERACTION=1
-ENV POETRY_VIRTUALENVS_IN_PROJECT=true
-ENV POETRY_VIRTUALENVS_CREATE=true
+WORKDIR /app/api
 
-# Install poetry in a separate layer
-RUN pip install --no-cache-dir "poetry==${POETRY_VERSION}"
+# Install Poetry and dependencies in a single layer
+RUN pip install --no-cache-dir "poetry==${POETRY_VERSION}" && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends \
+    gcc g++ libc-dev libffi-dev libgmp-dev libmpfr-dev libmpc-dev \
+    postgresql postgresql-contrib curl git nodejs npm && \
+    rm -rf /var/lib/apt/lists/*
 
-# Create and switch to non-root user early
-RUN useradd -m -u 1000 user && \
+# Set up directories and permissions
+RUN mkdir -p /var/run/postgresql /var/lib/postgresql/data /data/storage && \
+    chown -R postgres:postgres /var/run/postgresql /var/lib/postgresql/data && \
+    chmod 2777 /var/run/postgresql && \
+    chmod 700 /var/lib/postgresql/data && \
     chown -R user:user /app /opt/poetry /tmp/poetry_cache
 
+# Switch to user for Poetry operations
 USER user
 
-# Copy dependency files
-COPY --chown=user:user api/pyproject.toml api/poetry.lock api/poetry.toml ./
+# Copy dependency files with correct ownership
+COPY --chown=user pyproject.toml poetry.lock poetry.toml ./
 
-# Install dependencies
+# Install Python dependencies
 RUN poetry install --no-root --no-dev
 
-# Switch back to root for system installations
-USER root
-
-# Install system dependencies
-RUN apt-get update && \
-    apt-get install -y postgresql postgresql-contrib curl git gcc python3-dev \
-    libgmp-dev libmpfr-dev libmpc-dev nodejs npm && \
-    rm -rf /var/lib/apt/lists/* && \
-    mkdir -p /var/run/postgresql /var/lib/postgresql/data /data/storage && \
-    chown -R postgres:postgres /var/run/postgresql /var/lib/postgresql/data && \
-    chmod 2777 /var/run/postgresql && \
-    chmod 700 /var/lib/postgresql/data
-
-# Initialize PostgreSQL
+# Initialize PostgreSQL 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 && \
@@ -47,14 +48,17 @@ RUN /usr/lib/postgresql/15/bin/initdb -D /var/lib/postgresql/data && \
 
 # Switch back to user
 USER user
+
+# Set up user environment (HF requirement)
 ENV HOME=/home/user \
     PATH=/home/user/.local/bin:$PATH
 
-# Copy entrypoint script
-COPY api/docker/entrypoint.sh /app/entrypoint.sh
+# Copy application code and entrypoint
+COPY --chown=user . /app/api/
+COPY --chown=user docker/entrypoint.sh /app/entrypoint.sh
 RUN chmod +x /app/entrypoint.sh
 
-# Set environment variables
+# Set required environment variables
 ENV FLASK_APP=app.py \
     EDITION=SELF_HOSTED \
     DEPLOY_ENV=PRODUCTION \
@@ -66,6 +70,7 @@ ENV FLASK_APP=app.py \
     DB_DATABASE=dify \
     MIGRATION_ENABLED=true
 
+# Expose HF required port
 EXPOSE 7860
 
 WORKDIR /app