Update Dockerfile

Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu:latest
 
 WORKDIR /content
 
+# Install system dependencies
 RUN apt-get update && apt-get install -y \
     python3 \
     python3-pip \
@@ -22,48 +23,89 @@ RUN apt-get update && apt-get install -y \
     libgtk2.0-0 \
     jq \
     libraw1394-dev \
-    libopenblas-dev
-    
-RUN alias python=python3    
+    libopenblas-dev \
+    # Add these dependencies for dlib
+    libx11-dev \
+    libatlas-base-dev
 
-RUN apt-get install -y gnupg wget htop sudo git git-lfs software-properties-common build-essential cmake curl 
-RUN apt-get install -y ffmpeg libavcodec-dev libavformat-dev libavdevice-dev libgl1 libgtk2.0-0 jq libraw1394-dev libopenblas-dev
+# Set Python alias
+RUN alias python=python3
+
+# Install additional dependencies
+RUN apt-get install -y ffmpeg
 RUN apt-add-repository -y universe
 
+# Pre-compile and install dlib separately with optimizations
+RUN git clone https://github.com/davisking/dlib.git && \
+    cd dlib && \
+    mkdir build && \
+    cd build && \
+    cmake .. -DDLIB_USE_CUDA=0 -DUSE_AVX_INSTRUCTIONS=1 && \
+    cmake --build . && \
+    cd .. && \
+    python3 setup.py install --no USE_AVX_INSTRUCTIONS --no-DLIB_USE_CUDA
+
+# Install Python packages (excluding dlib since we installed it separately)
 RUN pip install git+https://github.com/One-sixth/fairseq.git --break-system-packages
-# RUN pip3 install distutils "setuptools==44.0.0" --break-system-packages
 RUN pip3 install numpy==1.26.4 --break-system-packages
-RUN pip3 install pandas scipy matplotlib torch torchvision ffmpeg-python imageio[ffmpeg] tensorboardX huggingface-hub g2p_en opencv-python fairseq imageio torchaudio gradio gtts soundfile fairseq huggingface-hub g2p_en altair imageio-ffmpeg pocketsphinx dlib ffmpeg jq --break-system-packages
-
+RUN pip3 install pandas scipy matplotlib torch torchvision ffmpeg-python imageio[ffmpeg] \
+    tensorboardX huggingface-hub g2p_en opencv-python fairseq imageio torchaudio gradio \
+    gtts soundfile fairseq huggingface-hub g2p_en altair imageio-ffmpeg pocketsphinx \
+    ffmpeg jq --break-system-packages
 RUN pip install cmake==3.24.1.1 --break-system-packages
 
-RUN git clone https://github.com/TencentARC/GFPGAN.git && cd GFPGAN && pip install basicsr --break-system-packages && pip install facexlib --break-system-packages && pip install -r requirements.txt --break-system-packages && python3 setup.py develop && pip install realesrgan --break-system-packages
+# Rest of the Dockerfile remains the same
+# Install GFPGAN
+RUN git clone https://github.com/TencentARC/GFPGAN.git && \
+    cd GFPGAN && \
+    pip install basicsr --break-system-packages && \
+    pip install facexlib --break-system-packages && \
+    pip install -r requirements.txt --break-system-packages && \
+    python3 setup.py develop && \
+    pip install realesrgan --break-system-packages
+
+# Copy degradations file
 COPY degradations.py /usr/local/lib/python3.12/dist-packages/basicsr/data/degradations.py
-RUN git clone https://github.com/chi0tzp/PyVideoFramesExtractor && cd PyVideoFramesExtractor && pip install -r requirements.txt --break-system-packages
 
+# Install PyVideoFramesExtractor
+RUN git clone https://github.com/chi0tzp/PyVideoFramesExtractor && \
+    cd PyVideoFramesExtractor && \
+    pip install -r requirements.txt --break-system-packages
+
+# Install Git LFS and Pocketsphinx
 RUN git lfs install
-RUN git clone https://huggingface.co/camenduru/pocketsphinx-20.04-t4 pocketsphinx && cd pocketsphinx && cmake -S . -B build && cmake --build build --target install
-RUN git clone https://huggingface.co/camenduru/one-shot-talking-face-20.04-t4 one-shot-talking-face && cd one-shot-talking-face && pip install -r requirements.txt --break-system-packages && chmod 755 OpenFace/FeatureExtraction
+RUN git clone https://huggingface.co/camenduru/pocketsphinx-20.04-t4 pocketsphinx && \
+    cd pocketsphinx && \
+    cmake -S . -B build && \
+    cmake --build build --target install
+
+# Install One-Shot Talking Face
+RUN git clone https://huggingface.co/camenduru/one-shot-talking-face-20.04-t4 one-shot-talking-face && \
+    cd one-shot-talking-face && \
+    pip install -r requirements.txt --break-system-packages && \
+    chmod 755 OpenFace/FeatureExtraction
+
+# Copy utility file and modify scripts
 COPY util.py /content/one-shot-talking-face/models/util.py
 RUN sed -i 's/.cuda()/ /' one-shot-talking-face/test_script.py
 RUN sed -i 's/.cuda()/ /' one-shot-talking-face/tools/interface.py
 RUN sed -i 's/.load(checkpoint_path)/.load(checkpoint_path,map_location=torch.device("cpu")) /' one-shot-talking-face/tools/interface.py
 RUN sed -i 's/.load(audio2pose)/.load(audio2pose,map_location=torch.device("cpu")) /' one-shot-talking-face/tools/interface.py
-RUN mkdir /content/out
 
+# Setup output directory
+RUN mkdir /content/out
 COPY app.py /content/app.py
 
-
+# Setup user and permissions
 RUN adduser --disabled-password --gecos '' admin
 RUN adduser admin sudo
 RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
 RUN chown -R admin:admin /content
 RUN chmod -R 777 /content
 RUN chown -R admin:admin /home
 RUN chmod -R 777 /home
-USER admin
 
+USER admin
 EXPOSE 7860
 
 CMD ["python3", "app.py"]