Build one docker image instead of mutiple different docker images (#1721)

Signed-off-by: Wang, Xigui <[email protected]>

Author: xiguiw

comps/rerankings/src/Dockerfile

@@ -6,7 +6,6 @@ FROM python:3.11-slim
 ENV LANG=C.UTF-8
 
 ARG ARCH="cpu"
-ARG SERVICE="all"
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \
     git \
@@ -24,15 +23,7 @@ RUN pip install --no-cache-dir --upgrade pip setuptools
 RUN if [ ${ARCH} = "cpu" ]; then \
     pip install --no-cache-dir torch --index-url https://download.pytorch.org/whl/cpu; \
     fi && \
-    if [ ${SERVICE} = "videoqna" ]; then \
-        pip install --no-cache-dir -r /home/user/comps/rerankings/src/requirements_videoqna.txt; \
-    elif [ ${SERVICE} = "all" ]; then \
-        git clone https://github.com/IntelLabs/fastRAG.git /home/user/fastRAG && \
-        cd /home/user/fastRAG && \
-        pip install --no-cache-dir . && \
-        pip install --no-cache-dir .[intel] && \
-        pip install --no-cache-dir -r /home/user/comps/rerankings/src/requirements_videoqna.txt; \
-    fi && \
+    pip install --no-cache-dir -r /home/user/comps/rerankings/src/requirements_videoqna.txt && \
     pip install --no-cache-dir -r /home/user/comps/rerankings/src/requirements.txt;
 
 COPY comps /home/user/comps

tests/rerankings/test_reranking_ovms.sh

@@ -14,7 +14,6 @@ function build_docker_images() {
           -t opea/reranking:comps \
           --build-arg https_proxy=$https_proxy \
           --build-arg http_proxy=$http_proxy \
-          --build-arg SERVICE=ovms \
           -f comps/rerankings/src/Dockerfile .
     if [ $? -ne 0 ]; then
         echo "opea/reranking built fail"

tests/rerankings/test_rerankings_tei.sh

@@ -15,7 +15,6 @@ function build_docker_images() {
           -t opea/reranking:comps \
           --build-arg https_proxy=$https_proxy \
           --build-arg http_proxy=$http_proxy \
-          --build-arg SERVICE=tei \
           -f comps/rerankings/src/Dockerfile .
     if [ $? -ne 0 ]; then
         echo "opea/reranking built fail"

tests/rerankings/test_rerankings_tei_on_intel_hpu.sh

@@ -15,7 +15,6 @@ function build_docker_images() {
           -t opea/reranking:comps \
           --build-arg https_proxy=$https_proxy \
           --build-arg http_proxy=$http_proxy \
-          --build-arg SERVICE=tei \
           -f comps/rerankings/src/Dockerfile .
     if [ $? -ne 0 ]; then
         echo "opea/reranking built fail"

tests/rerankings/test_rerankings_videoqna.sh

@@ -15,7 +15,6 @@ function build_docker_images() {
           -t opea/reranking:comps \
           --build-arg https_proxy=$https_proxy \
           --build-arg http_proxy=$http_proxy \
-          --build-arg SERVICE=videoqna \
           -f comps/rerankings/src/Dockerfile .
     if [ $? -ne 0 ]; then
         echo "opea/reranking built fail"