Skip to content

Commit

Permalink
Fix trivy scan issue of setuptools. (#1240)
Browse files Browse the repository at this point in the history
Signed-off-by: ZePan110 <[email protected]>
  • Loading branch information
ZePan110 authored Jan 27, 2025
1 parent 09c3eeb commit f51f322
Show file tree
Hide file tree
Showing 39 changed files with 68 additions and 83 deletions.
4 changes: 0 additions & 4 deletions comps/agent/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ RUN useradd -m -s /bin/bash user && \
mkdir -p /home/user && \
chown -R user /home/user/

USER user

COPY comps /home/user/comps

RUN pip install --no-cache-dir --upgrade pip setuptools && \
Expand All @@ -28,8 +26,6 @@ RUN pip install --no-cache-dir --upgrade pip setuptools && \

ENV PYTHONPATH=/home/user

USER root

RUN mkdir -p /home/user/comps/agent/src/status && chown -R user /home/user/comps/agent/src/status

USER user
Expand Down
3 changes: 1 addition & 2 deletions comps/animation/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ FROM python:3.11-slim
RUN useradd -m -s /bin/bash user && \
mkdir -p /home/user && \
chown -R user /home/user/
USER user

ENV LANG=C.UTF-8
ARG ARCH=cpu
Expand All @@ -18,7 +17,7 @@ RUN pip install --no-cache-dir --upgrade pip && \
pip install --no-cache-dir -r /home/user/comps/animation/src/requirements.txt ;

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER user
WORKDIR /home/user/comps/animation/src

ENTRYPOINT ["python3", "opea_animation_microservice.py"]
3 changes: 1 addition & 2 deletions comps/asr/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ FROM python:3.11-slim
RUN useradd -m -s /bin/bash user && \
mkdir -p /home/user && \
chown -R user /home/user/
USER user

ENV LANG=C.UTF-8
ARG ARCH=cpu
Expand All @@ -22,7 +21,7 @@ RUN pip install --no-cache-dir --upgrade pip setuptools && \
fi

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER user
WORKDIR /home/user/comps/asr/src

ENTRYPOINT ["python", "opea_asr_microservice.py"]
4 changes: 1 addition & 3 deletions comps/asr/src/integrations/dependency/whisper/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ RUN apt-get update \

COPY --chown=user:user comps /home/user/comps

USER user

RUN pip install --no-cache-dir --upgrade pip setuptools && \
pip install --no-cache-dir -r /home/user/comps/asr/src/requirements.txt && \
if [ "${ARCH}" = "cpu" ]; then \
Expand All @@ -29,7 +27,7 @@ RUN pip install --no-cache-dir --upgrade pip setuptools && \
fi

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER user
WORKDIR /home/user/comps/asr/src/integrations/dependency/whisper

ENTRYPOINT ["python", "whisper_server.py", "--device", "cpu"]
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@ RUN apt-get update \

COPY --chown=user:user comps /home/user/comps

USER user

# Install requirements and optimum habana
RUN pip install --no-cache-dir --upgrade pip && \
pip install --no-cache-dir -r /home/user/comps/asr/src/requirements.txt && \
pip install --no-cache-dir optimum[habana]

ENV PYTHONPATH=$PYTHONPATH:/home/users

USER user
WORKDIR /home/user/comps/asr/src/integrations/dependency/whisper

ENTRYPOINT ["python", "whisper_server.py", "--device", "hpu"]
4 changes: 2 additions & 2 deletions comps/chathistory/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ RUN useradd -m -s /bin/bash user && \
mkdir -p /home/user && \
chown -R user /home/user/

USER user

COPY comps /home/user/comps
COPY requirements.txt /home/user/

Expand All @@ -25,6 +23,8 @@ RUN pip install --no-cache-dir --upgrade pip setuptools && \

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER user

WORKDIR /home/user/comps/chathistory/src

ENTRYPOINT ["python", "opea_chathistory_microservice.py"]
4 changes: 0 additions & 4 deletions comps/dataprep/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ RUN useradd -m -s /bin/bash user && \
mkdir -p /home/user && \
chown -R user /home/user/

USER user

COPY comps /home/user/comps

RUN pip install --no-cache-dir --upgrade pip setuptools && \
Expand All @@ -46,8 +44,6 @@ RUN pip install --no-cache-dir --upgrade pip setuptools && \

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER root

RUN mkdir -p /home/user/comps/dataprep/src/uploaded_files && chown -R user /home/user/comps/dataprep/src/uploaded_files

USER user
Expand Down
4 changes: 2 additions & 2 deletions comps/feedback_management/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ RUN useradd -m -s /bin/bash user && \
mkdir -p /home/user && \
chown -R user /home/user/

USER user

COPY comps /home/user/comps
COPY requirements.txt /home/user/

Expand All @@ -25,6 +23,8 @@ RUN pip install --no-cache-dir --upgrade pip setuptools && \

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER user

WORKDIR /home/user/comps/feedback_management/src

ENTRYPOINT ["python", "opea_feedback_microservice.py"]
4 changes: 2 additions & 2 deletions comps/finetuning/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ COPY comps /home/user/comps

RUN chown -R user /home/user/comps/finetuning

USER user

ENV PATH=$PATH:/home/user/.local/bin

RUN python -m pip install --no-cache-dir --upgrade pip && \
Expand All @@ -28,6 +26,8 @@ RUN python -m pip install --no-cache-dir --upgrade pip && \

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER 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 && \
Expand Down
4 changes: 2 additions & 2 deletions comps/finetuning/src/Dockerfile.intel_hpu
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ COPY comps /home/user/comps

RUN chown -R user /home/user/comps/finetuning

USER user

ENV PATH=$PATH:/home/user/.local/bin

RUN python -m pip install --no-cache-dir --upgrade pip && \
Expand All @@ -24,6 +22,8 @@ RUN python -m pip install --no-cache-dir --upgrade pip && \

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER user

WORKDIR /home/user/comps/finetuning/src

ENTRYPOINT ["/bin/bash", "launch.sh"]
4 changes: 2 additions & 2 deletions comps/guardrails/src/bias_detection/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ RUN useradd -m -s /bin/bash user && \
mkdir -p /home/user && \
chown -R user /home/user/

USER user

COPY comps /home/user/comps

RUN pip install --no-cache-dir --upgrade pip && \
Expand All @@ -26,6 +24,8 @@ RUN pip install --no-cache-dir --upgrade pip && \

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER user

WORKDIR /home/user/comps/guardrails/src/bias_detection/

ENTRYPOINT ["python", "opea_bias_detection_microservice.py"]
4 changes: 2 additions & 2 deletions comps/guardrails/src/guardrails/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ RUN useradd -m -s /bin/bash user && \
mkdir -p /home/user && \
chown -R user /home/user/

USER user

COPY comps /home/user/comps

RUN pip install --no-cache-dir --upgrade pip setuptools && \
Expand All @@ -25,6 +23,8 @@ RUN pip install --no-cache-dir --upgrade pip setuptools && \

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER user

WORKDIR /home/user/comps/guardrails/src/guardrails/

ENTRYPOINT ["python", "opea_guardrails_microservice.py"]
4 changes: 2 additions & 2 deletions comps/guardrails/src/hallucination_detection/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ RUN useradd -m -s /bin/bash user && \
mkdir -p /home/user && \
chown -R user /home/user/

USER user

COPY comps /home/user/comps

RUN pip install --no-cache-dir --upgrade pip && \
Expand All @@ -26,6 +24,8 @@ RUN pip install --no-cache-dir --upgrade pip && \

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER user

WORKDIR /home/user/comps/guardrails/src/hallucination_detection

ENTRYPOINT ["bash", "entrypoint.sh"]
4 changes: 2 additions & 2 deletions comps/guardrails/src/toxicity_detection/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ RUN useradd -m -s /bin/bash user && \
mkdir -p /home/user && \
chown -R user /home/user/

USER user

COPY comps /home/user/comps

RUN pip install --no-cache-dir --upgrade pip setuptools && \
Expand All @@ -26,6 +24,8 @@ RUN pip install --no-cache-dir --upgrade pip setuptools && \

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER user

WORKDIR /home/user/comps/guardrails/src/toxicity_detection/

ENTRYPOINT ["python", "opea_toxicity_detection_microservice.py"]
4 changes: 2 additions & 2 deletions comps/image2image/src/Dockerfile.intel_hpu
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ COPY comps /home/user/comps
RUN chown -R user /home/user/comps/image2image

RUN rm -rf /etc/ssh/ssh_host*
USER user

# Set environment variables
ENV LANG=en_US.UTF-8
ENV PYTHONPATH=/home/user:/usr/lib/habanalabs/:/home/user/optimum-habana
Expand All @@ -21,7 +21,7 @@ ENV PYTHONPATH=/home/user:/usr/lib/habanalabs/:/home/user/optimum-habana
RUN pip install --no-cache-dir --upgrade pip && \
pip install --no-cache-dir -r /home/user/comps/image2image/src/requirements.txt && \
pip install --no-cache-dir optimum[habana]

USER user
WORKDIR /home/user/comps/image2image/src

RUN echo python opea_image2image_microservice.py --device hpu --use_hpu_graphs --bf16 >> run.sh
Expand Down
4 changes: 2 additions & 2 deletions comps/image2video/src/Dockerfile.intel_hpu
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ COPY comps /home/user/comps
RUN chown -R user /home/user/comps/image2video

RUN rm -rf /etc/ssh/ssh_host*
USER user

# Set environment variables
ENV LANG=en_US.UTF-8
ENV PYTHONPATH=/home/user:/usr/lib/habanalabs/:/optimum-habana
Expand All @@ -36,7 +36,7 @@ RUN pip install --no-cache-dir --upgrade pip && \
pip install --no-cache-dir optimum[habana]

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER user
WORKDIR /home/user/comps/image2video/src

ENTRYPOINT ["python", "opea_image2video_microservice.py", "--device", "hpu"]
4 changes: 2 additions & 2 deletions comps/llms/src/doc-summarization/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ RUN useradd -m -s /bin/bash user && \
mkdir -p /home/user && \
chown -R user /home/user/

USER user

COPY comps /home/user/comps

RUN pip install --no-cache-dir --upgrade pip setuptools && \
Expand All @@ -23,6 +21,8 @@ RUN pip install --no-cache-dir --upgrade pip setuptools && \

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER user

WORKDIR /home/user/comps/llms/src/doc-summarization

ENTRYPOINT ["bash", "entrypoint.sh"]
4 changes: 2 additions & 2 deletions comps/llms/src/faq-generation/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ RUN useradd -m -s /bin/bash user && \
mkdir -p /home/user && \
chown -R user /home/user/

USER user

COPY comps /home/user/comps

RUN pip install --no-cache-dir --upgrade pip setuptools && \
pip install --no-cache-dir -r /home/user/comps/llms/src/faq-generation/requirements.txt

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER user

WORKDIR /home/user/comps/llms/src/faq-generation

ENTRYPOINT ["bash", "entrypoint.sh"]
4 changes: 2 additions & 2 deletions comps/llms/src/text-generation/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ RUN useradd -m -s /bin/bash user && \
mkdir -p /home/user && \
chown -R user /home/user/

USER user

COPY comps /home/user/comps

RUN pip install --no-cache-dir --upgrade pip setuptools && \
pip install --no-cache-dir -r /home/user/comps/llms/src/text-generation/requirements.txt

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER user

WORKDIR /home/user/comps/llms/src/text-generation

ENTRYPOINT ["bash", "entrypoint.sh"]
4 changes: 2 additions & 2 deletions comps/llms/src/text-generation/Dockerfile.intel_hpu
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ RUN useradd -m -s /bin/bash user && \
mkdir -p /home/user && \
chown -R user /home/user/

USER user

RUN git lfs install

COPY comps /home/user/comps
Expand All @@ -35,6 +33,8 @@ RUN git clone ${REPO} /home/user/optimum-habana && \

ENV PYTHONPATH=/root:/home/user

USER user

WORKDIR /home/user/comps/llms/src/text-generation/

ENTRYPOINT ["bash", "entrypoint.sh"]
4 changes: 2 additions & 2 deletions comps/llms/utils/lm-eval/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
python3-pip \
wget

USER user

COPY comps /home/user/comps

RUN pip install --no-cache-dir --upgrade pip && \
pip install --no-cache-dir -r /home/user/comps/llms/utils/lm-eval/requirements.txt

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER user

WORKDIR /home/user/comps/llms/utils/lm-eval


Expand Down
4 changes: 2 additions & 2 deletions comps/lvms/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ RUN useradd -m -s /bin/bash user && \
mkdir -p /home/user && \
chown -R user /home/user/

USER user

ENV LANG=C.UTF-8

COPY comps /home/user/comps
Expand All @@ -18,6 +16,8 @@ RUN pip install --no-cache-dir --upgrade pip setuptools && \

ENV PYTHONPATH=$PYTHONPATH:/home/user

USER user

WORKDIR /home/user/comps/lvms/src

ENTRYPOINT ["python", "opea_lvm_microservice.py"]
Loading

0 comments on commit f51f322

Please sign in to comment.