Update Dockerfile

Dockerfile

@@ -1,7 +1,10 @@
 # Base Python image with correct version
-FROM python:3.12-slim-bookworm AS base
+FROM python:3.12-slim-bookworm
 
-# Set up environment variables according to HF guidelines
+# Create non-root user early (HF requirement)
+RUN useradd -m -u 1000 user
+
+# Set up environment variables
 ENV PYTHONDONTWRITEBYTECODE=1 \
     POETRY_VERSION=1.8.4 \
     POETRY_HOME=/opt/poetry \
@@ -9,14 +12,12 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
     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
+    POETRY_REQUESTS_TIMEOUT=15 \
+    PYTHONPATH=/app
 
-WORKDIR /app/api
+WORKDIR /app
 
-# Install Poetry and dependencies in a single layer
+# Install system dependencies
 RUN pip install --no-cache-dir "poetry==${POETRY_VERSION}" && \
     apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -25,27 +26,28 @@ RUN pip install --no-cache-dir "poetry==${POETRY_VERSION}" && \
     curl git nodejs npm && \
     rm -rf /var/lib/apt/lists/*
 
-# Create a requirements.txt from poetry dependencies
-RUN echo "flask==3.0.1\n\
-    gunicorn==22.0.0\n\
-    gevent==24.11.1\n\
-    celery==5.4.0\n\
-    redis==5.0.3\n\
-    psycopg2-binary==2.9.6\n\
-    sqlalchemy==2.0.29\n\
-    flask-migrate==4.0.5\n\
-    flask-sqlalchemy==3.1.1" > requirements.txt
+# Copy application code
+COPY --chown=user api /app/api
+WORKDIR /app/api
 
 # Install Python dependencies
-RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install --no-cache-dir flask==3.0.1 \
+    gunicorn==22.0.0 \
+    gevent==24.11.1 \
+    celery==5.4.0 \
+    redis==5.0.3 \
+    psycopg2-binary==2.9.6 \
+    sqlalchemy==2.0.29 \
+    flask-migrate==4.0.5 \
+    flask-sqlalchemy==3.1.1
 
-# Create and set up entrypoint script (before user switch)
+# Create and set up entrypoint script
 RUN echo '#!/bin/bash\n\
 set -e\n\
 \n\
 if [[ "${MIGRATION_ENABLED}" == "true" ]]; then\n\
   echo "Running migrations"\n\
-  flask upgrade-db\n\
+  cd /app/api && flask db upgrade\n\
 fi\n\
 \n\
 if [[ "${DEBUG}" == "true" ]]; then\n\
@@ -63,11 +65,11 @@ fi' > /entrypoint.sh && \
     chown user:user /entrypoint.sh
 
 # Set up directories and permissions
-RUN mkdir -p /var/run/postgresql /var/lib/postgresql/data /data/storage /opt/poetry /tmp/poetry_cache && \
+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
+    chown -R user:user /app
 
 # Switch to user
 USER user
@@ -77,7 +79,7 @@ ENV HOME=/home/user \
     PATH=/home/user/.local/bin:$PATH
 
 # Set required environment variables
-ENV FLASK_APP=app.py \
+ENV FLASK_APP=/app/api/app.py \
     EDITION=SELF_HOSTED \
     DEPLOY_ENV=PRODUCTION \
     MODE=api \
@@ -91,7 +93,7 @@ ENV FLASK_APP=app.py \
 # Expose HF required port
 EXPOSE 7860
 
-WORKDIR /app
+WORKDIR /app/api
 
 ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]