From fb47706e991beefb660fac6ee8096882ee8bb4ee Mon Sep 17 00:00:00 2001 From: Xinyao Wang Date: Mon, 23 Dec 2024 12:51:02 +0800 Subject: [PATCH] fix dockerfile path Signed-off-by: Xinyao Wang --- .../docker/compose/llms-compose.yaml | 4 +++ .../text-generation/vllm/langchain/Dockerfile | 31 ------------------- .../langchain/build_docker_microservice.sh | 9 ------ 3 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 comps/llms/text-generation/vllm/langchain/Dockerfile delete mode 100644 comps/llms/text-generation/vllm/langchain/build_docker_microservice.sh diff --git a/.github/workflows/docker/compose/llms-compose.yaml b/.github/workflows/docker/compose/llms-compose.yaml index ad9862bfa5..2d42e6f46d 100644 --- a/.github/workflows/docker/compose/llms-compose.yaml +++ b/.github/workflows/docker/compose/llms-compose.yaml @@ -42,6 +42,10 @@ services: dockerfile: Dockerfile.hpu shm_size: '128g' image: ${REGISTRY:-opea}/vllm-gaudi:${TAG:-latest} + vllm-arc: + build: + dockerfile: comps/llms/text-generation/vllm/langchain/dependency/Dockerfile.intel_gpu + image: ${REGISTRY:-opea}/vllm-arc:${TAG:-latest} llm-eval: build: dockerfile: comps/llms/utils/lm-eval/Dockerfile diff --git a/comps/llms/text-generation/vllm/langchain/Dockerfile b/comps/llms/text-generation/vllm/langchain/Dockerfile deleted file mode 100644 index 025d6dbd54..0000000000 --- a/comps/llms/text-generation/vllm/langchain/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -FROM python:3.11-slim - -ARG ARCH="cpu" # Set this to "cpu" or "gpu" - -RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \ - libgl1-mesa-glx \ - libjemalloc-dev - -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 && \ - 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 \ - pip install --no-cache-dir -r /home/user/comps/llms/text-generation/vllm/langchain/requirements.txt; \ - fi - -ENV PYTHONPATH=$PYTHONPATH:/home/user - -WORKDIR /home/user/comps/llms/text-generation/vllm/langchain - -ENTRYPOINT ["bash", "entrypoint.sh"] diff --git a/comps/llms/text-generation/vllm/langchain/build_docker_microservice.sh b/comps/llms/text-generation/vllm/langchain/build_docker_microservice.sh deleted file mode 100644 index 1e504d8687..0000000000 --- a/comps/llms/text-generation/vllm/langchain/build_docker_microservice.sh +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -cd ../../../../../ -docker build \ - -t opea/llm-vllm:latest \ - --build-arg https_proxy=$https_proxy \ - --build-arg http_proxy=$http_proxy \ - -f comps/llms/text-generation/vllm/langchain/Dockerfile .