From 85e347952a74adebfff3479cff97c709d7c1119a Mon Sep 17 00:00:00 2001 From: ZePan110 Date: Wed, 19 Feb 2025 01:10:06 +0800 Subject: [PATCH 1/2] Fix trivy issue in Dockerfile. Signed-off-by: ZePan110 --- AvatarChatbot/Dockerfile | 2 +- ChatQnA/tests/test_compose_on_gaudi.sh | 3 +-- EdgeCraftRAG/Dockerfile.server | 3 ++- EdgeCraftRAG/ui/docker/Dockerfile.ui | 3 ++- VideoQnA/ui/docker/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/AvatarChatbot/Dockerfile b/AvatarChatbot/Dockerfile index 3266bc296a..f0fa5744e7 100644 --- a/AvatarChatbot/Dockerfile +++ b/AvatarChatbot/Dockerfile @@ -32,7 +32,7 @@ COPY --from=git $HOME/GenAIComps/comps $HOME/GenAIComps/comps COPY --from=git $HOME/GenAIComps/*.* $HOME/GenAIComps/LICENSE $HOME/GenAIComps/ WORKDIR $HOME/GenAIComps -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir -r $HOME/GenAIComps/requirements.txt WORKDIR $HOME diff --git a/ChatQnA/tests/test_compose_on_gaudi.sh b/ChatQnA/tests/test_compose_on_gaudi.sh index 59ffbb3ded..2785995bbb 100644 --- a/ChatQnA/tests/test_compose_on_gaudi.sh +++ b/ChatQnA/tests/test_compose_on_gaudi.sh @@ -2,7 +2,7 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -set -xe +set -e IMAGE_REPO=${IMAGE_REPO:-"opea"} IMAGE_TAG=${IMAGE_TAG:-"latest"} echo "REGISTRY=IMAGE_REPO=${IMAGE_REPO}" @@ -47,7 +47,6 @@ function start_services() { export NUM_CARDS=1 export INDEX_NAME="rag-redis" export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN} - export HF_TOKEN=${HUGGINGFACEHUB_API_TOKEN} export host_ip=${ip_address} export JAEGER_IP=$(ip route get 8.8.8.8 | grep -oP 'src \K[^ ]+') export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=grpc://$JAEGER_IP:4317 diff --git a/EdgeCraftRAG/Dockerfile.server b/EdgeCraftRAG/Dockerfile.server index 3bb572f116..9fca40bd25 100644 --- a/EdgeCraftRAG/Dockerfile.server +++ b/EdgeCraftRAG/Dockerfile.server @@ -37,7 +37,8 @@ RUN mkdir -p /home/user/gradio_cache ENV GRADIO_TEMP_DIR=/home/user/gradio_cache WORKDIR /home/user/edgecraftrag -RUN pip install --no-cache-dir -r requirements.txt +RUN pip install --no-cache-dir --upgrade pip setuptools && \ + pip install --no-cache-dir -r requirements.txt WORKDIR /home/user/ diff --git a/EdgeCraftRAG/ui/docker/Dockerfile.ui b/EdgeCraftRAG/ui/docker/Dockerfile.ui index 3dacb35d8d..8abffc5557 100644 --- a/EdgeCraftRAG/ui/docker/Dockerfile.ui +++ b/EdgeCraftRAG/ui/docker/Dockerfile.ui @@ -15,7 +15,8 @@ RUN mkdir -p /home/user/gradio_cache ENV GRADIO_TEMP_DIR=/home/user/gradio_cache WORKDIR /home/user/ui -RUN pip install --no-cache-dir -r requirements.txt +RUN pip install --no-cache-dir --upgrade pip setuptools && \ + pip install --no-cache-dir -r requirements.txt USER user diff --git a/VideoQnA/ui/docker/Dockerfile b/VideoQnA/ui/docker/Dockerfile index dcd029a0b8..019999de8a 100644 --- a/VideoQnA/ui/docker/Dockerfile +++ b/VideoQnA/ui/docker/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y curl && \ rm -rf /var/lib/apt/lists/* -RUN pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip setuptools && \ pip install --no-cache-dir streamlit COPY ui.py /app/ui.py From fdd453047bdc72ec0c83743564466d7dd8e20ea7 Mon Sep 17 00:00:00 2001 From: ZePan110 Date: Thu, 20 Feb 2025 17:14:16 +0800 Subject: [PATCH 2/2] Remove edgecraftrag fix Signed-off-by: ZePan110 --- EdgeCraftRAG/Dockerfile.server | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/EdgeCraftRAG/Dockerfile.server b/EdgeCraftRAG/Dockerfile.server index 9fca40bd25..3bb572f116 100644 --- a/EdgeCraftRAG/Dockerfile.server +++ b/EdgeCraftRAG/Dockerfile.server @@ -37,8 +37,7 @@ RUN mkdir -p /home/user/gradio_cache ENV GRADIO_TEMP_DIR=/home/user/gradio_cache WORKDIR /home/user/edgecraftrag -RUN pip install --no-cache-dir --upgrade pip setuptools && \ - pip install --no-cache-dir -r requirements.txt +RUN pip install --no-cache-dir -r requirements.txt WORKDIR /home/user/