diff --git a/Dockerfile b/Dockerfile index cf90a91..8649ffb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,20 +7,29 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ffmpeg curl libgl1-mesa-glx libglib2.0-0 \ && rm -rf /var/lib/apt/lists/* -COPY requirements-cpu.txt /tmp/requirements.txt -RUN pip install --no-cache-dir -r /tmp/requirements.txt && rm /tmp/requirements.txt +COPY requirements-cpu.txt /tmp/requirements-cpu.txt +COPY requirements.txt /tmp/requirements.txt +RUN pip install --no-cache-dir -r /tmp/requirements-cpu.txt && rm /tmp/requirements*.txt # ---- GPU base ---- FROM nvidia/cuda:12.4.1-cudnn-runtime-ubuntu22.04 AS base-gpu RUN apt-get update && apt-get install -y --no-install-recommends \ - python3 python3-pip python3-venv \ + software-properties-common \ + && add-apt-repository ppa:deadsnakes/ppa \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + python3.12 python3.12-venv python3.12-dev \ ffmpeg curl libgl1-mesa-glx libglib2.0-0 \ + && ln -sf /usr/bin/python3.12 /usr/bin/python3 \ && ln -sf /usr/bin/python3 /usr/bin/python \ + && python3 -m ensurepip --upgrade \ + && python3 -m pip install --no-cache-dir --upgrade pip \ && rm -rf /var/lib/apt/lists/* -COPY requirements-gpu.txt /tmp/requirements.txt -RUN pip install --no-cache-dir --break-system-packages -r /tmp/requirements.txt && rm /tmp/requirements.txt +COPY requirements-gpu.txt /tmp/requirements-gpu.txt +COPY requirements.txt /tmp/requirements.txt +RUN pip install --no-cache-dir -r /tmp/requirements-gpu.txt && rm /tmp/requirements*.txt # ---- Final stage ---- FROM base-${VARIANT} AS final diff --git a/requirements-cpu.txt b/requirements-cpu.txt index 7ccbc5d..8e4e5b4 100644 --- a/requirements-cpu.txt +++ b/requirements-cpu.txt @@ -1,2 +1,2 @@ -r requirements.txt -onnxruntime==1.20.1 +onnxruntime==1.24.1 diff --git a/requirements-gpu.txt b/requirements-gpu.txt index 5b36193..79b263f 100644 --- a/requirements-gpu.txt +++ b/requirements-gpu.txt @@ -1,2 +1,2 @@ -r requirements.txt -onnxruntime-gpu==1.20.1 +onnxruntime-gpu==1.24.1 diff --git a/requirements.txt b/requirements.txt index d071052..810a69c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,9 +4,9 @@ python-multipart==0.0.18 pydantic-settings==2.7.1 psutil==6.1.1 -# FaceFusion dependencies (excluding gradio) -numpy==1.26.4 -opencv-python==4.10.0.84 -onnx==1.17.0 -scipy==1.14.1 -tqdm==4.67.1 +# FaceFusion dependencies (matching facefusion/requirements.txt, excluding gradio) +numpy==2.2.1 +opencv-python==4.13.0.92 +onnx==1.20.1 +scipy==1.17.0 +tqdm==4.67.3