Misc apt and pip updates to Dockerfiles

comps/dataprep/src/Dockerfile

@@ -10,13 +10,13 @@ ARG ARCH="cpu"
 RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \
     build-essential \
     default-jre \
+    libcairo2 \
     libgl1-mesa-glx \
     libjemalloc-dev \
+    libpq-dev \
     libreoffice \
     poppler-utils \
     tesseract-ocr \
-    libpq-dev \
-    libcairo2 \
     wget
 
 # Install ffmpeg static build

comps/finetuning/src/Dockerfile.xtune

@@ -17,29 +17,28 @@ RUN useradd -m -s /bin/bash user && \
 RUN wget -qO - https://repositories.intel.com/gpu/intel-graphics.key | gpg --yes --dearmor --output /usr/share/keyrings/intel-graphics.gpg && \
 echo "deb [arch=amd64,i386 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu jammy unified" | \
         tee /etc/apt/sources.list.d/intel-gpu-jammy.list &&\
-    apt update -y &&\
-    apt install -y \
-        libze-intel-gpu1 libze1 intel-opencl-icd clinfo \
-        libze-dev intel-ocloc \
+    apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \
+        clinfo \
         intel-level-zero-gpu-raytracing \
-        vim \
+        intel-ocloc \
+        intel-opencl-icd \
+        libze1 \
+        libze-dev \
+        libze-intel-gpu1 \
         rsync
 
 COPY comps /home/user/comps
 
-
 RUN chown -R user /home/user/comps/finetuning
 
 ENV PATH=$PATH:/home/user/.local/bin
 RUN cd /home/user/comps/finetuning/src/integrations/xtune && git config --global user.name "test" && git config --global user.email "test" && bash prepare_xtune.sh 
 
-RUN python -m pip install --upgrade pip setuptools peft && \
-    python -m pip install -r /home/user/comps/finetuning/src/requirements.txt 
+RUN python -m pip install --no-cache-dir --upgrade pip setuptools peft && \
+    python -m pip install --no-cache-dir -r /home/user/comps/finetuning/src/requirements.txt
 
 ENV PYTHONPATH=$PYTHONPATH:/home/user
 
-
-
 WORKDIR /home/user/comps/finetuning/src
 
 RUN echo PKGPATH=$(python3 -c "import pkg_resources; print(pkg_resources.get_distribution('oneccl-bind-pt').location)") >> run.sh && \

comps/image2image/src/Dockerfile

@@ -11,7 +11,7 @@ ARG ARCH="cpu"
 COPY comps /home/comps
 
 RUN pip install --no-cache-dir --upgrade pip setuptools && \
-    if [ ${ARCH} = "cpu" ]; then pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu; fi && \
+    if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch torchvision --index-url https://download.pytorch.org/whl/cpu; fi && \
     pip install --no-cache-dir -r /home/comps/image2image/src/requirements.txt
 
 ENV PYTHONPATH=$PYTHONPATH:/home

comps/image2video/src/Dockerfile

@@ -10,13 +10,20 @@ ARG ARCH="cpu"
 
 COPY comps /home/comps
 
-RUN apt-get update && apt-get install python3-opencv -y && \
-    pip install --no-cache-dir --upgrade pip setuptools && \
+RUN useradd -m -s /bin/bash user && \
+    mkdir -p /home/user && \
+    chown -R user /home/user/
+
+RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing python3-opencv
+
+RUN pip install --no-cache-dir --upgrade pip setuptools && \
     if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch torchvision --index-url https://download.pytorch.org/whl/cpu; fi && \
     pip install --no-cache-dir -r /home/comps/image2video/src/requirements.txt
 
 ENV PYTHONPATH=$PYTHONPATH:/home
 
+USER user
+
 WORKDIR /home/comps/image2video/src
 
-ENTRYPOINT ["python", "opea_image2video_microservice.py"]
+ENTRYPOINT ["python", "opea_image2video_microservice.py"]

comps/llms/src/text-generation/Dockerfile.intel_hpu_phi4

@@ -24,9 +24,9 @@ RUN pip install --no-cache-dir --upgrade pip setuptools && \
     pip install --no-cache-dir --upgrade-strategy eager optimum[habana] && \
     pip install --no-cache-dir git+https://github.com/HabanaAI/[email protected]
 
-RUN pip install git+https://github.com/huggingface/optimum-habana.git@transformers_future && \
+RUN pip install --no-cache-dir git+https://github.com/huggingface/optimum-habana.git@transformers_future && \
     cd /home/user/comps/llms/src/text-generation/ && pip install --no-cache-dir -r requirements.txt && \
-    pip install soundfile peft backoff
+    pip install --no-cache-dir soundfile peft backoff
 
 ENV PYTHONPATH=/root:/home/user
 ENV HABANA_LOGS=/home/user/logs

comps/rerankings/src/Dockerfile

@@ -19,22 +19,21 @@ RUN useradd -m -s /bin/bash user && \
 
 COPY comps/rerankings/src/requirements* /home/user/comps/rerankings/src/
 
+RUN pip install --no-cache-dir --upgrade pip setuptools
+
 RUN if [ ${ARCH} = "cpu" ]; then \
     pip install --no-cache-dir torch --index-url https://download.pytorch.org/whl/cpu; \
-fi && \
-if [ ${SERVICE} = "videoqna" ]; then \
-    pip install --no-cache-dir --upgrade pip setuptools && \
-    pip install --no-cache-dir -r /home/user/comps/rerankings/src/requirements_videoqna.txt; \
-elif [ ${SERVICE} = "all" ]; then \
-    git clone https://github.com/IntelLabs/fastRAG.git /home/user/fastRAG && \
-    cd /home/user/fastRAG && \
-    pip install --no-cache-dir --upgrade pip setuptools && \
-    pip install --no-cache-dir . && \
-    pip install --no-cache-dir .[intel] && \
-    pip install --no-cache-dir -r /home/user/comps/rerankings/src/requirements_videoqna.txt; \
-fi && \
-pip install --no-cache-dir --upgrade pip setuptools && \
-pip install --no-cache-dir -r /home/user/comps/rerankings/src/requirements.txt;
+    fi && \
+    if [ ${SERVICE} = "videoqna" ]; then \
+        pip install --no-cache-dir -r /home/user/comps/rerankings/src/requirements_videoqna.txt; \
+    elif [ ${SERVICE} = "all" ]; then \
+        git clone https://github.com/IntelLabs/fastRAG.git /home/user/fastRAG && \
+        cd /home/user/fastRAG && \
+        pip install --no-cache-dir . && \
+        pip install --no-cache-dir .[intel] && \
+        pip install --no-cache-dir -r /home/user/comps/rerankings/src/requirements_videoqna.txt; \
+    fi && \
+    pip install --no-cache-dir -r /home/user/comps/rerankings/src/requirements.txt;
 
 COPY comps /home/user/comps
 ENV PYTHONPATH=$PYTHONPATH:/home/user

comps/retrievers/src/Dockerfile

@@ -6,11 +6,10 @@ FROM python:3.11-slim
 ARG ARCH="cpu"
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \
-    libgl1-mesa-glx \
-    libjemalloc-dev \
     libcairo2 \
+    libgl1-mesa-glx \
     libglib2.0-0 \
-    vim
+    libjemalloc-dev
 
 RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \

comps/text2graph/src/Dockerfile

@@ -25,9 +25,6 @@ RUN pip install --no-cache-dir --upgrade pip setuptools && \
         pip install --no-cache-dir -r /home/user/comps/text2graph/src/requirements.txt; \
     fi
 
-ENV https_proxy=${https_proxy}
-ENV http_proxy=${http_proxy}
-ENV no_proxy=${no_proxy}
 ENV LLM_ID=${LLM_ID:-"Babelscape/rebel-large"}
 ENV SPAN_LENGTH=${SPAN_LENGTH:-"1024"}
 ENV OVERLAP=${OVERLAP:-"100"}

comps/third_parties/bridgetower/src/Dockerfile

@@ -5,7 +5,8 @@ FROM python:3.10-slim
 RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
     chown -R user /home/user/
-RUN apt-get update && apt-get install -y curl
+
+RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing curl
 
 # Set environment variables
 ENV LANG=en_US.UTF-8

comps/third_parties/bridgetower/src/Dockerfile.intel_hpu

@@ -8,7 +8,7 @@ RUN useradd -m -s /bin/bash user && \
     chown -R user /home/user/
 
 RUN rm -rf /etc/ssh/ssh_host*
-RUN apt-get update && apt-get install -y curl
+RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing curl
 
 # Set environment variables
 ENV LANG=en_US.UTF-8

comps/third_parties/gpt-sovits/src/Dockerfile

@@ -7,9 +7,16 @@ RUN useradd -m -s /bin/bash user && \
     chown -R user /home/user/
 
 # Install system dependencies
-RUN apt-get update && \
-    apt-get install -y ffmpeg git-lfs git wget vim build-essential numactl && \
-    apt-get install -y libomp-dev google-perftools curl && \
+RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
+    build-essential \
+    curl \
+    ffmpeg \
+    git \
+    git-lfs \
+    google-perftools \
+    libomp-dev \
+    numactl \
+    wget && \
     pip install --upgrade pip
 
 ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libiomp5.so:/usr/lib/x86_64-linux-gnu/libtcmalloc.so.4

comps/third_parties/ipex/src/Dockerfile

@@ -5,21 +5,19 @@
 
 ARG BASE_IMAGE=ubuntu:22.04
 FROM ${BASE_IMAGE} AS base
-RUN if [ -f /etc/apt/apt.conf.d/proxy.conf ]; then rm /etc/apt/apt.conf.d/proxy.conf; fi && \
-    if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::Proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf.d/proxy.conf; fi && \
-    if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::Proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf.d/proxy.conf; fi
-RUN apt update && \
-    apt full-upgrade -y && \
-    DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y \
+
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --fix-missing \
     ca-certificates \
-    git \
     curl \
-    wget \
-    vim \
-    numactl \
-    gcc-12 \
     g++-12 \
+    gcc-12 \
+    git \
     make
+    numactl \
+    wget
+
 RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 && \
     update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 100 && \
     update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 100 && \
@@ -42,14 +40,14 @@ RUN . ~/miniforge3/bin/activate && conda create -y -n compile_py310 python=3.10
     unset CC && unset CXX
 
 FROM base AS deploy
-RUN apt update && \
-    DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y \
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --fix-missing \
     google-perftools \
-    openssh-server \
-    net-tools && \
-    apt clean && \
+    net-tools \
+    openssh-server && \
+    apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
-    if [ -f /etc/apt/apt.conf.d/proxy.conf ]; then rm /etc/apt/apt.conf.d/proxy.conf; fi
+
 COPY --from=dev /root/intel-extension-for-pytorch/examples/cpu/llm ./llm
 COPY --from=dev /root/intel-extension-for-pytorch/tools/get_libstdcpp_lib.sh ./llm/tools
 RUN . ~/miniforge3/bin/activate && conda create -y -n py310 python=3.10 && conda activate py310 && \
@@ -60,7 +58,7 @@ RUN . ~/miniforge3/bin/activate && conda create -y -n py310 python=3.10 && conda
     mv ./oneCCL_release /opt/oneCCL && \
     chown -R root:root /opt/oneCCL && \
     sed -i "s|ONECCL_PATH=.*|ONECCL_PATH=/opt/oneCCL|" ./tools/env_activate.sh && \
-    pip install backoff fastapi uvicorn
+    pip install --no-cache-dir backoff fastapi uvicorn
 ARG PORT_SSH=22
 RUN mkdir /var/run/sshd && \
     sed -i "s/#Port.*/Port ${PORT_SSH}/" /etc/ssh/sshd_config && \
@@ -74,4 +72,3 @@ COPY ./comps/third_parties/ipex/src/openai_protocol.py /root
 COPY ./comps/third_parties/ipex/src/entrypoint.sh /usr/local/bin/entrypoint.sh
 RUN chmod +x /usr/local/bin/entrypoint.sh
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-

comps/third_parties/llama-vision/src/Dockerfile

@@ -7,10 +7,10 @@ FROM vault.habana.ai/gaudi-docker/1.19.0/ubuntu22.04/habanalabs/pytorch-installe
 ENV LANG=en_US.UTF-8
 
 RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
+    curl \
     git-lfs \
     libgl1-mesa-glx \
-    libjemalloc-dev \
-    curl
+    libjemalloc-dev
 
 RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \

comps/third_parties/llama-vision/src/Dockerfile.guard

@@ -7,10 +7,10 @@ FROM vault.habana.ai/gaudi-docker/1.19.0/ubuntu22.04/habanalabs/pytorch-installe
 ENV LANG=en_US.UTF-8
 
 RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
+    curl \
     git-lfs \
     libgl1-mesa-glx \
-    libjemalloc-dev \
-    curl
+    libjemalloc-dev
 
 RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \

comps/third_parties/llama-vision/src/Dockerfile.tp

@@ -7,10 +7,10 @@ FROM vault.habana.ai/gaudi-docker/1.19.0/ubuntu22.04/habanalabs/pytorch-installe
 ENV LANG=en_US.UTF-8
 
 RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
+    curl \
     git-lfs \
     libgl1-mesa-glx \
-    libjemalloc-dev \
-    curl
+    libjemalloc-dev
 
 RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \

comps/third_parties/llava/src/Dockerfile

@@ -7,8 +7,7 @@ RUN useradd -m -s /bin/bash user && \
     chown -R user /home/user/
 
 # Install system dependencies
-RUN apt-get update \
-    && apt-get install -y curl
+RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing curl
 
 # Set environment variables
 ENV LANG=en_US.UTF-8

comps/third_parties/llava/src/Dockerfile.intel_hpu

@@ -8,8 +8,7 @@ RUN useradd -m -s /bin/bash user && \
     chown -R user /home/user/
 
 # Install system dependencies
-RUN apt-get update \
-    && apt-get install -y curl
+RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing curl
 
 RUN rm -rf /etc/ssh/ssh_host*
 

comps/third_parties/pathway/src/Dockerfile

@@ -7,10 +7,10 @@ ENV DOCKER_BUILDKIT=1
 ENV PYTHONUNBUFFERED=1
 ARG ARCH="cpu"
 
-RUN apt-get update && apt-get install -y \
-    poppler-utils \
-    libreoffice \
+RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
     libmagic-dev \
+    libreoffice \
+    poppler-utils \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app

comps/third_parties/predictionguard/src/Dockerfile

@@ -9,8 +9,7 @@ ENV LANG=en_US.UTF-8
 COPY comps /home/user/comps
 
 # Install system dependencies
-RUN apt-get update \
-    && apt-get install -y curl
+RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing curl
 
 RUN pip install --no-cache-dir --upgrade pip setuptools && \
     pip install --no-cache-dir -r /home/user/comps/third_parties/predictionguard/src/requirements.txt

comps/third_parties/speecht5/src/Dockerfile

@@ -12,9 +12,9 @@ ENV PYTHONPATH=/home/user
 ARG ARCH=cpu
 
 # Install system dependencies
-RUN apt-get update \
-    && apt-get install -y ffmpeg \
-    && apt-get install -y curl
+RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
+    curl \
+    ffmpeg
 
 COPY --chown=user:user comps /home/user/comps
 

comps/third_parties/speecht5/src/Dockerfile.intel_hpu

@@ -14,9 +14,9 @@ ENV PYTHONPATH=/home/user:/usr/lib/habanalabs/:/optimum-habana
 ENV LD_LIBRARY_PATH=/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH
 
 # Install system dependencies
-RUN apt-get update \
-    && apt-get install -y ffmpeg \
-    && apt-get install -y curl
+RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
+    curl \
+    ffmpeg
 
 COPY --chown=user:user comps /home/user/comps
 

comps/third_parties/video-llama/src/Dockerfile

@@ -6,7 +6,9 @@ FROM python:3.9-slim
 ENV LANG=C.UTF-8
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \
-    git git-lfs curl && \ 
+    curl \
+    git \
+    git-lfs && \
     git lfs install
 
 RUN useradd -m -s /bin/bash user && \