Merge branch 'main' of https://github.com/AI-Riksarkivet/htrflow_app

.docker/dockerfile

@@ -1,10 +1,66 @@
-FROM python:3.12-slim-bullseye
+# Base image with CUDA 12.6.3 and cuDNN
+FROM nvidia/cuda:12.6.3-cudnn-runtime-ubuntu22.04
 
-COPY --from=ghcr.io/astral-sh/uv:latest /uv /bin/uv
+# Set environment variables
+ARG DEBIAN_FRONTEND=noninteractive
+ENV PYTHONUNBUFFERED=1 \
+    GRADIO_FLAGGING_MODE=never \
+    GRADIO_NUM_PORTS=1 \
+    GRADIO_SERVER_NAME=0.0.0.0 \
+    GRADIO_THEME=huggingface \
+    SYSTEM=spaces \
+    AM_I_IN_A_DOCKER_CONTAINER=Yes \
+    PYTHONPATH=/home/appuser/app \
+    HF_HOME=/home/appuser/.cache \
+    TORCH_HOME=/home/appuser/.cache \
+    TMP_DIR=/home/appuser/tmp \
+    TRANSFORMERS_CACHE=/home/appuser/.cache/transformers \
+    NVIDIA_VISIBLE_DEVICES=all \
+    NVIDIA_DRIVER_CAPABILITIES=compute,utility
 
-COPY . /app
+# Install system dependencies and set Python 3.10 as default
+RUN apt-get update && apt-get install --no-install-recommends -y \
+    build-essential \
+    python3.10 \
+    python3.10-distutils \
+    python3-pip \
+    ffmpeg \
+    libsm6 \
+    libxext6 \
+    libgl1 \
+    && ln -sf /usr/bin/python3.10 /usr/bin/python \
+    && ln -sf /usr/bin/pip3 /usr/bin/pip \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /app
-RUN uv sync --frozen --no-cache
+# Install `uv`
+RUN pip install --upgrade pip \
+    && pip install uv
 
-CMD ["/app/.venv/bin/fastapi", "run", "app/main.py", "--port", "80"]
+# Create a non-root user
+RUN useradd -m -u 1000 appuser
+
+# Set working directory
+WORKDIR /home/appuser/app
+
+# Copy dependency files and install dependencies
+COPY --chown=appuser pyproject.toml uv.lock LICENSE README.md ./ 
+RUN uv sync --frozen --no-cache \
+    && chown -R appuser:appuser /home/appuser/app/.venv \
+    && rm -rf /root/.cache /home/appuser/.cache
+
+
+# Copy application code
+COPY --chown=appuser app app
+
+# Ensure non-root user has write access to cache and tmp directories
+RUN mkdir -p /home/appuser/.cache/transformers /home/appuser/tmp /home/appuser/.cache \
+    && chown -R appuser:appuser /home/appuser/.cache /home/appuser/tmp/ /home/appuser/app/
+
+# Switch to non-root user
+USER appuser
+
+# Expose port for Gradio
+EXPOSE 7862
+
+# Command to run the application
+CMD ["uv", "run", "python", "app/main.py"]