From 6518c0f046ecb315733962782b14500fb0ae3924 Mon Sep 17 00:00:00 2001 From: "chen, suyue" Date: Tue, 22 Oct 2024 15:02:48 +0800 Subject: [PATCH] upgrade setuptools version to fix CVE-2024-6345 (#806) Signed-off-by: chensuyue --- comps/asr/whisper/Dockerfile | 2 +- comps/asr/whisper/dependency/Dockerfile | 2 +- comps/chathistory/mongo/Dockerfile | 2 +- comps/embeddings/mosec/langchain/Dockerfile | 2 +- .../mosec/langchain/dependency/Dockerfile | 13 +++++++------ .../multimodal/multimodal_langchain/Dockerfile | 2 +- comps/embeddings/multimodal_clip/Dockerfile | 2 +- comps/embeddings/predictionguard/Dockerfile | 2 +- comps/embeddings/tei/langchain/Dockerfile | 2 +- comps/feedback_management/mongo/Dockerfile | 2 +- .../factuality/predictionguard/Dockerfile | 2 +- comps/guardrails/llama_guard/langchain/Dockerfile | 2 +- .../pii_detection/predictionguard/Dockerfile | 2 +- .../prompt_injection/predictionguard/Dockerfile | 2 +- comps/guardrails/toxicity_detection/Dockerfile | 2 +- .../toxicity_detection/predictionguard/Dockerfile | 2 +- comps/guardrails/wildguard/langchain/Dockerfile | 2 +- comps/image2video/Dockerfile | 2 +- comps/image2video/dependency/Dockerfile | 2 +- comps/intent_detection/langchain/Dockerfile | 2 +- comps/llms/faq-generation/tgi/langchain/Dockerfile | 2 +- comps/llms/summarization/tgi/langchain/Dockerfile | 2 +- .../text-generation/ollama/langchain/Dockerfile | 2 +- .../llms/text-generation/predictionguard/Dockerfile | 2 +- comps/llms/text-generation/tgi/Dockerfile | 2 +- .../llms/text-generation/vllm/langchain/Dockerfile | 2 +- comps/llms/text-generation/vllm/ray/Dockerfile | 2 +- comps/lvms/llava/Dockerfile | 2 +- comps/lvms/llava/dependency/Dockerfile | 2 +- comps/lvms/predictionguard/Dockerfile | 2 +- comps/lvms/video-llama/Dockerfile | 2 +- comps/prompt_registry/mongo/Dockerfile | 2 +- comps/ragas/tgi/langchain/Dockerfile | 2 +- comps/reranks/mosec/langchain/Dockerfile | 2 +- comps/reranks/tei/Dockerfile | 2 +- comps/reranks/videoqna/Dockerfile | 2 +- comps/retrievers/milvus/langchain/Dockerfile | 2 +- .../multimodal/redis/langchain/Dockerfile | 2 +- comps/retrievers/neo4j/langchain/Dockerfile | 2 +- comps/retrievers/pathway/langchain/Dockerfile | 2 +- comps/retrievers/pgvector/langchain/Dockerfile | 2 +- comps/retrievers/pinecone/langchain/Dockerfile | 2 +- comps/retrievers/qdrant/haystack/Dockerfile | 2 +- comps/retrievers/redis/langchain/Dockerfile | 2 +- comps/retrievers/redis/llama_index/Dockerfile | 2 +- comps/retrievers/vdms/langchain/Dockerfile | 2 +- comps/text2image/Dockerfile | 2 +- comps/tts/speecht5/Dockerfile | 2 +- comps/tts/speecht5/dependency/Dockerfile | 2 +- comps/web_retrievers/chroma/langchain/Dockerfile | 2 +- 50 files changed, 56 insertions(+), 55 deletions(-) diff --git a/comps/asr/whisper/Dockerfile b/comps/asr/whisper/Dockerfile index 05c02c880..5615f9815 100644 --- a/comps/asr/whisper/Dockerfile +++ b/comps/asr/whisper/Dockerfile @@ -13,7 +13,7 @@ ARG ARCH=cpu COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +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 ; \ pip install --no-cache-dir --extra-index-url https://download.pytorch.org/whl/cpu -r /home/user/comps/asr/whisper/requirements.txt ; \ diff --git a/comps/asr/whisper/dependency/Dockerfile b/comps/asr/whisper/dependency/Dockerfile index e94713757..9c191db60 100644 --- a/comps/asr/whisper/dependency/Dockerfile +++ b/comps/asr/whisper/dependency/Dockerfile @@ -19,7 +19,7 @@ COPY --chown=user:user comps /home/user/comps USER user -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/user/comps/asr/whisper/requirements.txt && \ if [ "${ARCH}" = "cpu" ]; then \ pip install --no-cache-dir torch torchvision --index-url https://download.pytorch.org/whl/cpu ; \ diff --git a/comps/chathistory/mongo/Dockerfile b/comps/chathistory/mongo/Dockerfile index 81e0fde5e..58b1c5aa4 100644 --- a/comps/chathistory/mongo/Dockerfile +++ b/comps/chathistory/mongo/Dockerfile @@ -19,7 +19,7 @@ USER user COPY comps /home/user/comps COPY requirements.txt /home/user/ -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/user/comps/chathistory/mongo/requirements.txt && \ pip install --no-cache-dir -r /home/user/requirements.txt diff --git a/comps/embeddings/mosec/langchain/Dockerfile b/comps/embeddings/mosec/langchain/Dockerfile index 6868fd57d..dafccecb0 100644 --- a/comps/embeddings/mosec/langchain/Dockerfile +++ b/comps/embeddings/mosec/langchain/Dockerfile @@ -15,7 +15,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/user/comps/embeddings/mosec/langchain/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user diff --git a/comps/embeddings/mosec/langchain/dependency/Dockerfile b/comps/embeddings/mosec/langchain/dependency/Dockerfile index ae1ce27a3..0fa6bb26e 100644 --- a/comps/embeddings/mosec/langchain/dependency/Dockerfile +++ b/comps/embeddings/mosec/langchain/dependency/Dockerfile @@ -1,21 +1,22 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -From ubuntu:22.04 +FROM python:3.11-slim + RUN useradd -m -s /bin/bash user && \ mkdir -p /home/user && \ chown -R user /home/user/ + ARG DEBIAN_FRONTEND=noninteractive ENV GLIBC_TUNABLES glibc.cpu.x86_shstk=permissive -RUN apt update && apt install -y python3 python3-pip COPY comps /home/user/comps -RUN pip3 install torch==2.2.2 torchvision --index-url https://download.pytorch.org/whl/cpu -RUN pip3 install intel-extension-for-pytorch==2.2.0 -RUN pip3 install transformers -RUN pip3 install llmspec mosec +RUN pip install --no-cache-dir --upgrade pip setuptools +RUN pip install --no-cache-dir torch==2.2.2 torchvision --index-url https://download.pytorch.org/whl/cpu +RUN pip install --no-cache-dir intel-extension-for-pytorch==2.2.0 +RUN pip install --no-cache-dir transformers llmspec mosec RUN cd /home/user/ && export HF_ENDPOINT=https://hf-mirror.com && huggingface-cli download --resume-download BAAI/bge-large-zh-v1.5 --local-dir /home/user/bge-large-zh-v1.5 USER user diff --git a/comps/embeddings/multimodal/multimodal_langchain/Dockerfile b/comps/embeddings/multimodal/multimodal_langchain/Dockerfile index a03f8fb9e..282581f1f 100644 --- a/comps/embeddings/multimodal/multimodal_langchain/Dockerfile +++ b/comps/embeddings/multimodal/multimodal_langchain/Dockerfile @@ -15,7 +15,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/user/comps/embeddings/multimodal/multimodal_langchain/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user diff --git a/comps/embeddings/multimodal_clip/Dockerfile b/comps/embeddings/multimodal_clip/Dockerfile index 5820607c0..03703b500 100644 --- a/comps/embeddings/multimodal_clip/Dockerfile +++ b/comps/embeddings/multimodal_clip/Dockerfile @@ -17,7 +17,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +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/user/comps/embeddings/multimodal_clip/requirements.txt diff --git a/comps/embeddings/predictionguard/Dockerfile b/comps/embeddings/predictionguard/Dockerfile index e2c10ffa6..4176e1f71 100644 --- a/comps/embeddings/predictionguard/Dockerfile +++ b/comps/embeddings/predictionguard/Dockerfile @@ -5,7 +5,7 @@ FROM python:3.11-slim COPY comps /home/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/comps/embeddings/predictionguard/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home diff --git a/comps/embeddings/tei/langchain/Dockerfile b/comps/embeddings/tei/langchain/Dockerfile index 7b30734ad..1cce58717 100644 --- a/comps/embeddings/tei/langchain/Dockerfile +++ b/comps/embeddings/tei/langchain/Dockerfile @@ -17,7 +17,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch --index-url https://download.pytorch.org/whl/cpu; fi && \ pip install --no-cache-dir -r /home/user/comps/embeddings/tei/langchain/requirements.txt diff --git a/comps/feedback_management/mongo/Dockerfile b/comps/feedback_management/mongo/Dockerfile index 696ee0d04..1880a5009 100644 --- a/comps/feedback_management/mongo/Dockerfile +++ b/comps/feedback_management/mongo/Dockerfile @@ -19,7 +19,7 @@ USER user COPY comps /home/user/comps COPY requirements.txt /home/user/ -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/user/comps/feedback_management/mongo/requirements.txt && \ pip install --no-cache-dir -r /home/user/requirements.txt diff --git a/comps/guardrails/factuality/predictionguard/Dockerfile b/comps/guardrails/factuality/predictionguard/Dockerfile index 309b198c5..fdc8c8ff8 100644 --- a/comps/guardrails/factuality/predictionguard/Dockerfile +++ b/comps/guardrails/factuality/predictionguard/Dockerfile @@ -5,7 +5,7 @@ FROM python:3.11-slim COPY comps /home/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/comps/guardrails/factuality/predictionguard/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home diff --git a/comps/guardrails/llama_guard/langchain/Dockerfile b/comps/guardrails/llama_guard/langchain/Dockerfile index 63988cc4e..78c555d67 100644 --- a/comps/guardrails/llama_guard/langchain/Dockerfile +++ b/comps/guardrails/llama_guard/langchain/Dockerfile @@ -19,7 +19,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch --index-url https://download.pytorch.org/whl/cpu; fi && \ pip install --no-cache-dir -r /home/user/comps/guardrails/llama_guard/langchain/requirements.txt diff --git a/comps/guardrails/pii_detection/predictionguard/Dockerfile b/comps/guardrails/pii_detection/predictionguard/Dockerfile index f9f47ca29..ee8450aa6 100644 --- a/comps/guardrails/pii_detection/predictionguard/Dockerfile +++ b/comps/guardrails/pii_detection/predictionguard/Dockerfile @@ -6,7 +6,7 @@ FROM python:3.11-slim COPY comps /home/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/comps/guardrails/pii_detection/predictionguard/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home diff --git a/comps/guardrails/prompt_injection/predictionguard/Dockerfile b/comps/guardrails/prompt_injection/predictionguard/Dockerfile index c3f59efe3..41d41c106 100644 --- a/comps/guardrails/prompt_injection/predictionguard/Dockerfile +++ b/comps/guardrails/prompt_injection/predictionguard/Dockerfile @@ -6,7 +6,7 @@ FROM python:3.11-slim COPY comps /home/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/comps/guardrails/prompt_injection/predictionguard/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home diff --git a/comps/guardrails/toxicity_detection/Dockerfile b/comps/guardrails/toxicity_detection/Dockerfile index 897e62a23..448e75610 100644 --- a/comps/guardrails/toxicity_detection/Dockerfile +++ b/comps/guardrails/toxicity_detection/Dockerfile @@ -20,7 +20,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch --index-url https://download.pytorch.org/whl/cpu; fi && \ pip install --no-cache-dir -r /home/user/comps/guardrails/toxicity_detection/requirements.txt diff --git a/comps/guardrails/toxicity_detection/predictionguard/Dockerfile b/comps/guardrails/toxicity_detection/predictionguard/Dockerfile index c97b3ccda..7b6c287de 100644 --- a/comps/guardrails/toxicity_detection/predictionguard/Dockerfile +++ b/comps/guardrails/toxicity_detection/predictionguard/Dockerfile @@ -6,7 +6,7 @@ FROM python:3.11-slim COPY comps /home/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/comps/guardrails/toxicity_detection/predictionguard/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home diff --git a/comps/guardrails/wildguard/langchain/Dockerfile b/comps/guardrails/wildguard/langchain/Dockerfile index 531cceb87..e34f473d6 100644 --- a/comps/guardrails/wildguard/langchain/Dockerfile +++ b/comps/guardrails/wildguard/langchain/Dockerfile @@ -19,7 +19,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch --index-url https://download.pytorch.org/whl/cpu; fi && \ pip install --no-cache-dir -r /home/user/comps/guardrails/wildguard/langchain/requirements.txt diff --git a/comps/image2video/Dockerfile b/comps/image2video/Dockerfile index 9adef002c..0db29c4f8 100644 --- a/comps/image2video/Dockerfile +++ b/comps/image2video/Dockerfile @@ -8,7 +8,7 @@ ENV LANG=en_US.UTF-8 COPY comps /home/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/comps/image2video/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home diff --git a/comps/image2video/dependency/Dockerfile b/comps/image2video/dependency/Dockerfile index 2d10cae4e..d3108527a 100644 --- a/comps/image2video/dependency/Dockerfile +++ b/comps/image2video/dependency/Dockerfile @@ -11,7 +11,7 @@ ARG ARCH="cpu" COPY comps /home/comps RUN apt-get update && apt-get install python3-opencv -y && \ - pip install --no-cache-dir --upgrade pip && \ + 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/dependency/requirements.txt diff --git a/comps/intent_detection/langchain/Dockerfile b/comps/intent_detection/langchain/Dockerfile index 3e345958f..e80aba621 100644 --- a/comps/intent_detection/langchain/Dockerfile +++ b/comps/intent_detection/langchain/Dockerfile @@ -15,7 +15,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/user/comps/intent_detection/langchain/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user diff --git a/comps/llms/faq-generation/tgi/langchain/Dockerfile b/comps/llms/faq-generation/tgi/langchain/Dockerfile index 2cf7fa80c..357343595 100644 --- a/comps/llms/faq-generation/tgi/langchain/Dockerfile +++ b/comps/llms/faq-generation/tgi/langchain/Dockerfile @@ -15,7 +15,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/user/comps/llms/faq-generation/tgi/langchain/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user diff --git a/comps/llms/summarization/tgi/langchain/Dockerfile b/comps/llms/summarization/tgi/langchain/Dockerfile index 9691a5784..3a7312054 100644 --- a/comps/llms/summarization/tgi/langchain/Dockerfile +++ b/comps/llms/summarization/tgi/langchain/Dockerfile @@ -17,7 +17,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +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/user/comps/llms/summarization/tgi/langchain/requirements.txt diff --git a/comps/llms/text-generation/ollama/langchain/Dockerfile b/comps/llms/text-generation/ollama/langchain/Dockerfile index 6ac66d056..41e3720cd 100644 --- a/comps/llms/text-generation/ollama/langchain/Dockerfile +++ b/comps/llms/text-generation/ollama/langchain/Dockerfile @@ -16,7 +16,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/user/comps/llms/text-generation/ollama/langchain/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user diff --git a/comps/llms/text-generation/predictionguard/Dockerfile b/comps/llms/text-generation/predictionguard/Dockerfile index 2994a9e04..e85d7a854 100644 --- a/comps/llms/text-generation/predictionguard/Dockerfile +++ b/comps/llms/text-generation/predictionguard/Dockerfile @@ -5,7 +5,7 @@ FROM python:3.11-slim COPY comps /home/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/comps/llms/text-generation/predictionguard/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home diff --git a/comps/llms/text-generation/tgi/Dockerfile b/comps/llms/text-generation/tgi/Dockerfile index 831d83014..bbdd3bf6a 100644 --- a/comps/llms/text-generation/tgi/Dockerfile +++ b/comps/llms/text-generation/tgi/Dockerfile @@ -15,7 +15,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/user/comps/llms/text-generation/tgi/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user diff --git a/comps/llms/text-generation/vllm/langchain/Dockerfile b/comps/llms/text-generation/vllm/langchain/Dockerfile index 22d288225..025d6dbd5 100644 --- a/comps/llms/text-generation/vllm/langchain/Dockerfile +++ b/comps/llms/text-generation/vllm/langchain/Dockerfile @@ -17,7 +17,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then \ pip install --no-cache-dir --extra-index-url https://download.pytorch.org/whl/cpu -r /home/user/comps/llms/text-generation/vllm/langchain/requirements.txt; \ else \ diff --git a/comps/llms/text-generation/vllm/ray/Dockerfile b/comps/llms/text-generation/vllm/ray/Dockerfile index 148a4b01d..cf6e518df 100644 --- a/comps/llms/text-generation/vllm/ray/Dockerfile +++ b/comps/llms/text-generation/vllm/ray/Dockerfile @@ -15,7 +15,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/user/comps/llms/text-generation/vllm/ray/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user diff --git a/comps/lvms/llava/Dockerfile b/comps/lvms/llava/Dockerfile index 73a964a94..d4de4f184 100644 --- a/comps/lvms/llava/Dockerfile +++ b/comps/lvms/llava/Dockerfile @@ -15,7 +15,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then \ pip install --no-cache-dir --extra-index-url https://download.pytorch.org/whl/cpu -r /home/user/comps/lvms/llava/requirements.txt; \ else \ diff --git a/comps/lvms/llava/dependency/Dockerfile b/comps/lvms/llava/dependency/Dockerfile index 070dd4a44..20fc7d5f4 100644 --- a/comps/lvms/llava/dependency/Dockerfile +++ b/comps/lvms/llava/dependency/Dockerfile @@ -12,7 +12,7 @@ ENV PYTHONPATH=/home/user:/usr/lib/habanalabs/:/optimum-habana COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/user/comps/lvms/llava/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user diff --git a/comps/lvms/predictionguard/Dockerfile b/comps/lvms/predictionguard/Dockerfile index 65fac9974..64b858eb8 100644 --- a/comps/lvms/predictionguard/Dockerfile +++ b/comps/lvms/predictionguard/Dockerfile @@ -8,7 +8,7 @@ ENV LANG=en_US.UTF-8 COPY comps /home/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/comps/lvms/predictionguard/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home diff --git a/comps/lvms/video-llama/Dockerfile b/comps/lvms/video-llama/Dockerfile index b172a217a..0a896abb1 100644 --- a/comps/lvms/video-llama/Dockerfile +++ b/comps/lvms/video-llama/Dockerfile @@ -8,7 +8,7 @@ ENV LANG=en_US.UTF-8 COPY comps /home/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/comps/lvms/video-llama/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home diff --git a/comps/prompt_registry/mongo/Dockerfile b/comps/prompt_registry/mongo/Dockerfile index a2845430c..25e14cd33 100644 --- a/comps/prompt_registry/mongo/Dockerfile +++ b/comps/prompt_registry/mongo/Dockerfile @@ -19,7 +19,7 @@ USER user COPY comps /home/user/comps COPY requirements.txt /home/user/ -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/user/comps/prompt_registry/mongo/requirements.txt && \ pip install --no-cache-dir -r /home/user/requirements.txt diff --git a/comps/ragas/tgi/langchain/Dockerfile b/comps/ragas/tgi/langchain/Dockerfile index adec50e58..b280cb049 100644 --- a/comps/ragas/tgi/langchain/Dockerfile +++ b/comps/ragas/tgi/langchain/Dockerfile @@ -15,7 +15,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/user/comps/ragas/tgi/langchain/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user diff --git a/comps/reranks/mosec/langchain/Dockerfile b/comps/reranks/mosec/langchain/Dockerfile index 509c0238b..6b536d4be 100644 --- a/comps/reranks/mosec/langchain/Dockerfile +++ b/comps/reranks/mosec/langchain/Dockerfile @@ -15,7 +15,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/user/comps/reranks/mosec/langchain/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user diff --git a/comps/reranks/tei/Dockerfile b/comps/reranks/tei/Dockerfile index 4331af992..6c6016bcd 100644 --- a/comps/reranks/tei/Dockerfile +++ b/comps/reranks/tei/Dockerfile @@ -19,7 +19,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch --index-url https://download.pytorch.org/whl/cpu; fi && \ pip install --no-cache-dir -r /home/user/comps/reranks/tei/requirements.txt diff --git a/comps/reranks/videoqna/Dockerfile b/comps/reranks/videoqna/Dockerfile index 17a4a1c92..1d9522e23 100644 --- a/comps/reranks/videoqna/Dockerfile +++ b/comps/reranks/videoqna/Dockerfile @@ -14,7 +14,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r /home/user/comps/reranks/videoqna/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user diff --git a/comps/retrievers/milvus/langchain/Dockerfile b/comps/retrievers/milvus/langchain/Dockerfile index cc766cec4..38223f9ec 100644 --- a/comps/retrievers/milvus/langchain/Dockerfile +++ b/comps/retrievers/milvus/langchain/Dockerfile @@ -20,7 +20,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch --index-url https://download.pytorch.org/whl/cpu; fi && \ pip install --no-cache-dir -r /home/user/comps/retrievers/milvus/langchain/requirements.txt diff --git a/comps/retrievers/multimodal/redis/langchain/Dockerfile b/comps/retrievers/multimodal/redis/langchain/Dockerfile index 8d793f7e7..5c339069f 100644 --- a/comps/retrievers/multimodal/redis/langchain/Dockerfile +++ b/comps/retrievers/multimodal/redis/langchain/Dockerfile @@ -17,7 +17,7 @@ COPY comps /home/user/comps USER user -RUN pip install --no-cache-dir --upgrade pip && \ +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/user/comps/retrievers/multimodal/redis/langchain/requirements.txt diff --git a/comps/retrievers/neo4j/langchain/Dockerfile b/comps/retrievers/neo4j/langchain/Dockerfile index 34224bd9b..3609a34c4 100644 --- a/comps/retrievers/neo4j/langchain/Dockerfile +++ b/comps/retrievers/neo4j/langchain/Dockerfile @@ -22,7 +22,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch --index-url https://download.pytorch.org/whl/cpu; fi && \ pip install --no-cache-dir -r /home/user/comps/retrievers/neo4j/langchain/requirements.txt diff --git a/comps/retrievers/pathway/langchain/Dockerfile b/comps/retrievers/pathway/langchain/Dockerfile index f6cb8eab0..3aba6ab45 100644 --- a/comps/retrievers/pathway/langchain/Dockerfile +++ b/comps/retrievers/pathway/langchain/Dockerfile @@ -17,7 +17,7 @@ COPY comps /home/user/comps USER user -RUN pip install --no-cache-dir --upgrade pip && \ +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/user/comps/retrievers/pathway/langchain/requirements.txt diff --git a/comps/retrievers/pgvector/langchain/Dockerfile b/comps/retrievers/pgvector/langchain/Dockerfile index 484db5af7..13b241b95 100644 --- a/comps/retrievers/pgvector/langchain/Dockerfile +++ b/comps/retrievers/pgvector/langchain/Dockerfile @@ -17,7 +17,7 @@ COPY comps /home/user/comps USER user -RUN pip install --no-cache-dir --upgrade pip && \ +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/user/comps/retrievers/pgvector/langchain/requirements.txt diff --git a/comps/retrievers/pinecone/langchain/Dockerfile b/comps/retrievers/pinecone/langchain/Dockerfile index 2d488d3ed..a59e615f1 100644 --- a/comps/retrievers/pinecone/langchain/Dockerfile +++ b/comps/retrievers/pinecone/langchain/Dockerfile @@ -17,7 +17,7 @@ COPY comps /home/user/comps USER user -RUN pip install --no-cache-dir --upgrade pip && \ +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/user/comps/retrievers/pinecone/langchain/requirements.txt diff --git a/comps/retrievers/qdrant/haystack/Dockerfile b/comps/retrievers/qdrant/haystack/Dockerfile index 5b3881f99..eda88428b 100644 --- a/comps/retrievers/qdrant/haystack/Dockerfile +++ b/comps/retrievers/qdrant/haystack/Dockerfile @@ -15,7 +15,7 @@ USER user COPY comps /home/user/comps -RUN python -m pip install --no-cache-dir --upgrade pip && \ +RUN python -m pip install --no-cache-dir --upgrade pip setuptools && \ python -m pip install --no-cache-dir -r /home/user/comps/retrievers/qdrant/haystack/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user diff --git a/comps/retrievers/redis/langchain/Dockerfile b/comps/retrievers/redis/langchain/Dockerfile index 6b240a989..c2c5168f2 100644 --- a/comps/retrievers/redis/langchain/Dockerfile +++ b/comps/retrievers/redis/langchain/Dockerfile @@ -17,7 +17,7 @@ COPY comps /home/user/comps USER user -RUN pip install --no-cache-dir --upgrade pip && \ +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/user/comps/retrievers/redis/langchain/requirements.txt diff --git a/comps/retrievers/redis/llama_index/Dockerfile b/comps/retrievers/redis/llama_index/Dockerfile index b22e62058..2e48e8eff 100644 --- a/comps/retrievers/redis/llama_index/Dockerfile +++ b/comps/retrievers/redis/llama_index/Dockerfile @@ -21,7 +21,7 @@ COPY comps /home/user/comps USER user -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then \ pip install --no-cache-dir --extra-index-url https://download.pytorch.org/whl/cpu -r /home/user/comps/retrievers/redis/llama_index/requirements.txt; \ else \ diff --git a/comps/retrievers/vdms/langchain/Dockerfile b/comps/retrievers/vdms/langchain/Dockerfile index 0c69474b9..ce79a6b37 100644 --- a/comps/retrievers/vdms/langchain/Dockerfile +++ b/comps/retrievers/vdms/langchain/Dockerfile @@ -17,7 +17,7 @@ RUN useradd -m -s /bin/bash user && \ COPY comps /home/user/comps USER user -RUN pip install --no-cache-dir --upgrade pip && \ +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/user/comps/retrievers/vdms/langchain/requirements.txt diff --git a/comps/text2image/Dockerfile b/comps/text2image/Dockerfile index 156fac4d8..e18cec828 100644 --- a/comps/text2image/Dockerfile +++ b/comps/text2image/Dockerfile @@ -10,7 +10,7 @@ ARG ARCH="cpu" COPY comps /home/comps -RUN pip install --no-cache-dir --upgrade pip && \ +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/text2image/requirements.txt diff --git a/comps/tts/speecht5/Dockerfile b/comps/tts/speecht5/Dockerfile index abf977d46..5a78719df 100644 --- a/comps/tts/speecht5/Dockerfile +++ b/comps/tts/speecht5/Dockerfile @@ -11,7 +11,7 @@ ARG ARCH=cpu COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +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 ; \ pip install --no-cache-dir --extra-index-url https://download.pytorch.org/whl/cpu -r /home/user/comps/tts/speecht5/requirements.txt ; \ diff --git a/comps/tts/speecht5/dependency/Dockerfile b/comps/tts/speecht5/dependency/Dockerfile index e0a506b40..88d2df41a 100644 --- a/comps/tts/speecht5/dependency/Dockerfile +++ b/comps/tts/speecht5/dependency/Dockerfile @@ -20,7 +20,7 @@ COPY --chown=user:user comps /home/user/comps USER user -RUN pip install --no-cache-dir --upgrade pip && \ +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 ; \ pip install --no-cache-dir --extra-index-url https://download.pytorch.org/whl/cpu -r /home/user/comps/tts/speecht5/requirements.txt ; \ diff --git a/comps/web_retrievers/chroma/langchain/Dockerfile b/comps/web_retrievers/chroma/langchain/Dockerfile index 614dd6c9b..884cec524 100644 --- a/comps/web_retrievers/chroma/langchain/Dockerfile +++ b/comps/web_retrievers/chroma/langchain/Dockerfile @@ -17,7 +17,7 @@ USER user COPY comps /home/user/comps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then \ pip install --no-cache-dir --extra-index-url https://download.pytorch.org/whl/cpu -r /home/user/comps/web_retrievers/chroma/langchain/requirements.txt; \ else \