Introduce 'entrypoint.sh' for some Containers (#274)

ashahba · web-flow · commit 9ecc5c3b02ba · 2024-07-05T11:04:30.000+08:00
Signed-off-by: Abolfazl Shahbazi &lt;abolfazl.shahbazi@intel.com&gt;
diff --git a/comps/llms/summarization/tgi/Dockerfile b/comps/llms/summarization/tgi/Dockerfile
@@ -24,4 +24,4 @@ ENV PYTHONPATH=$PYTHONPATH:/home/user
 
 WORKDIR /home/user/comps/llms/summarization/tgi
 
-ENTRYPOINT ["python", "llm.py"]
+ENTRYPOINT ["bash", "entrypoint.sh"]
diff --git a/comps/llms/summarization/tgi/entrypoint.sh b/comps/llms/summarization/tgi/entrypoint.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+pip --no-cache-dir install -r requirements-runtime.txt
+
+python llm.py
diff --git a/comps/llms/summarization/tgi/requirements-runtime.txt b/comps/llms/summarization/tgi/requirements-runtime.txt
@@ -0,0 +1 @@
+langserve
diff --git a/comps/llms/summarization/tgi/requirements.txt b/comps/llms/summarization/tgi/requirements.txt
@@ -2,7 +2,6 @@ docarray[full]
 fastapi
 huggingface_hub
 langchain==0.1.16
-langserve
 langsmith
 opentelemetry-api
 opentelemetry-exporter-otlp
diff --git a/comps/llms/text-generation/ollama/Dockerfile b/comps/llms/text-generation/ollama/Dockerfile
@@ -25,4 +25,4 @@ ENV PYTHONPATH=$PYTHONPATH:/home/user
 
 WORKDIR /home/user/comps/llms/text-generation/ollama
 
-ENTRYPOINT ["python", "llm.py"]
+ENTRYPOINT ["bash", "entrypoint.sh"]
diff --git a/comps/llms/text-generation/ollama/entrypoint.sh b/comps/llms/text-generation/ollama/entrypoint.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+pip --no-cache-dir install -r requirements-runtime.txt
+
+python llm.py
diff --git a/comps/llms/text-generation/ollama/requirements-runtime.txt b/comps/llms/text-generation/ollama/requirements-runtime.txt
@@ -0,0 +1 @@
+langserve
diff --git a/comps/llms/text-generation/ollama/requirements.txt b/comps/llms/text-generation/ollama/requirements.txt
@@ -2,7 +2,6 @@ docarray[full]
 fastapi
 huggingface_hub
 langchain==0.1.16
-langserve
 langsmith
 opentelemetry-api
 opentelemetry-exporter-otlp
diff --git a/comps/llms/text-generation/ray_serve/docker/Dockerfile.microservice b/comps/llms/text-generation/ray_serve/docker/Dockerfile.microservice
@@ -34,4 +34,4 @@ ENV PYTHONPATH=$PYTHONPATH:/home/user
 
 WORKDIR /home/user/comps/llms/text-generation/ray_serve
 
-ENTRYPOINT ["python", "llm.py"]
+ENTRYPOINT ["bash", "entrypoint.sh"]
diff --git a/comps/llms/text-generation/ray_serve/entrypoint.sh b/comps/llms/text-generation/ray_serve/entrypoint.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+pip --no-cache-dir install -r requirements-runtime.txt
+
+python llm.py
diff --git a/comps/llms/text-generation/ray_serve/requirements-runtime.txt b/comps/llms/text-generation/ray_serve/requirements-runtime.txt
@@ -0,0 +1 @@
+langserve
diff --git a/comps/llms/text-generation/ray_serve/requirements.txt b/comps/llms/text-generation/ray_serve/requirements.txt
@@ -3,7 +3,6 @@ fastapi
 huggingface_hub
 langchain==0.1.16
 langchain_openai
-langserve
 langsmith
 openai
 opentelemetry-api
diff --git a/comps/llms/text-generation/tgi/Dockerfile b/comps/llms/text-generation/tgi/Dockerfile
@@ -24,4 +24,4 @@ ENV PYTHONPATH=$PYTHONPATH:/home/user
 
 WORKDIR /home/user/comps/llms/text-generation/tgi
 
-ENTRYPOINT ["python", "llm.py"]
+ENTRYPOINT ["bash", "entrypoint.sh"]
diff --git a/comps/llms/text-generation/tgi/entrypoint.sh b/comps/llms/text-generation/tgi/entrypoint.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+pip --no-cache-dir install -r requirements-runtime.txt
+
+python llm.py
diff --git a/comps/llms/text-generation/tgi/requirements-runtime.txt b/comps/llms/text-generation/tgi/requirements-runtime.txt
@@ -0,0 +1 @@
+langserve
diff --git a/comps/llms/text-generation/tgi/requirements.txt b/comps/llms/text-generation/tgi/requirements.txt
@@ -2,7 +2,6 @@ docarray[full]
 fastapi
 huggingface_hub
 langchain==0.1.16
-langserve
 langsmith
 opentelemetry-api
 opentelemetry-exporter-otlp
diff --git a/comps/llms/text-generation/vllm/docker/Dockerfile.microservice b/comps/llms/text-generation/vllm/docker/Dockerfile.microservice
@@ -29,4 +29,4 @@ ENV PYTHONPATH=$PYTHONPATH:/home/user
 
 WORKDIR /home/user/comps/llms/text-generation/vllm
 
-ENTRYPOINT ["python", "llm.py"]
+ENTRYPOINT ["bash", "entrypoint.sh"]
diff --git a/comps/llms/text-generation/vllm/entrypoint.sh b/comps/llms/text-generation/vllm/entrypoint.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+pip --no-cache-dir install -r requirements-runtime.txt
+
+python llm.py
diff --git a/comps/llms/text-generation/vllm/requirements-runtime.txt b/comps/llms/text-generation/vllm/requirements-runtime.txt
@@ -0,0 +1 @@
+langserve
diff --git a/comps/llms/text-generation/vllm/requirements.txt b/comps/llms/text-generation/vllm/requirements.txt
@@ -2,7 +2,6 @@ docarray[full]
 fastapi
 huggingface_hub
 langchain==0.1.16
-langserve
 opentelemetry-api
 opentelemetry-exporter-otlp
 opentelemetry-sdk
diff --git a/comps/ragas/tgi/Dockerfile b/comps/ragas/tgi/Dockerfile
@@ -1,26 +1,26 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-FROM langchain/langchain:latest
-
-RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \
-    libgl1-mesa-glx \
-    libjemalloc-dev \
-    vim
-
-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 && \
-    pip install --no-cache-dir -r /home/user/comps/ragas/tgi/requirements.txt
-
-ENV PYTHONPATH=$PYTHONPATH:/home/user
-
-WORKDIR /home/user/comps/ragas/tgi/
-
-ENTRYPOINT ["python", "llm.py"]
+FROM langchain/langchain:latest
+
+RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \
+    libgl1-mesa-glx \
+    libjemalloc-dev \
+    vim
+
+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 && \
+    pip install --no-cache-dir -r /home/user/comps/ragas/tgi/requirements.txt
+
+ENV PYTHONPATH=$PYTHONPATH:/home/user
+
+WORKDIR /home/user/comps/ragas/tgi/
+
+ENTRYPOINT ["bash", "entrypoint.sh"]
diff --git a/comps/ragas/tgi/entrypoint.sh b/comps/ragas/tgi/entrypoint.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+pip --no-cache-dir install -r requirements-runtime.txt
+
+python llm.py
diff --git a/comps/ragas/tgi/requirements-runtime.txt b/comps/ragas/tgi/requirements-runtime.txt
@@ -0,0 +1 @@
+langserve
diff --git a/comps/ragas/tgi/requirements.txt b/comps/ragas/tgi/requirements.txt
@@ -3,7 +3,6 @@ docarray[full]
 fastapi
 huggingface_hub
 langchain==0.1.16
-langserve
 langsmith
 opentelemetry-api
 opentelemetry-exporter-otlp

Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,4 @@ ENV PYTHONPATH=$PYTHONPATH:/home/user`
`24`	`24`
`25`	`25`	`WORKDIR /home/user/comps/llms/summarization/tgi`
`26`	`26`
`27`		`-ENTRYPOINT ["python", "llm.py"]`
	`27`	`+ENTRYPOINT ["bash", "entrypoint.sh"]`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,4 @@ ENV PYTHONPATH=$PYTHONPATH:/home/user`
`25`	`25`
`26`	`26`	`WORKDIR /home/user/comps/llms/text-generation/ollama`
`27`	`27`
`28`		`-ENTRYPOINT ["python", "llm.py"]`
	`28`	`+ENTRYPOINT ["bash", "entrypoint.sh"]`
Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,4 @@ ENV PYTHONPATH=$PYTHONPATH:/home/user`
`34`	`34`
`35`	`35`	`WORKDIR /home/user/comps/llms/text-generation/ray_serve`
`36`	`36`
`37`		`-ENTRYPOINT ["python", "llm.py"]`
	`37`	`+ENTRYPOINT ["bash", "entrypoint.sh"]`