Check duplicated dockerfile (#1289)

Signed-off-by: ZePan110 <ze.pan@intel.com>

Author: ZePan110

.github/workflows/scripts/check_duplicated_image.py

@@ -9,6 +9,8 @@
 import yaml
 
 images = {}
+dockerfiles = {}
+errors = []
 
 
 def check_docker_compose_build_definition(file_path):
@@ -30,18 +32,26 @@ def check_docker_compose_build_definition(file_path):
                 if not os.path.isfile(dockerfile):
                     # dockerfile not exists in the current repo context, assume it's in 3rd party context
                     dockerfile = os.path.normpath(os.path.join(context, build.get("dockerfile", "")))
-                item = {"file_path": file_path, "service": service, "dockerfile": dockerfile}
+                item = {"file_path": file_path, "service": service, "dockerfile": dockerfile, "image": image}
                 if image in images and dockerfile != images[image]["dockerfile"]:
-                    print("ERROR: !!! Found Conflicts !!!")
-                    print(f"Image: {image}, Dockerfile: {dockerfile}, defined in Service: {service}, File: {file_path}")
-                    print(
+                    errors.append(
+                        f"ERROR: !!! Found Conflicts !!!\n"
+                        f"Image: {image}, Dockerfile: {dockerfile}, defined in Service: {service}, File: {file_path}\n"
                         f"Image: {image}, Dockerfile: {images[image]['dockerfile']}, defined in Service: {images[image]['service']}, File: {images[image]['file_path']}"
                     )
-                    sys.exit(1)
                 else:
                     # print(f"Add Image: {image} Dockerfile: {dockerfile}")
                     images[image] = item
 
+                if dockerfile in dockerfiles and image != dockerfiles[dockerfile]["image"]:
+                    errors.append(
+                        f"WARNING: Different images using the same Dockerfile\n"
+                        f"Dockerfile: {dockerfile}, Image: {image}, defined in Service: {service}, File: {file_path}\n"
+                        f"Dockerfile: {dockerfile}, Image: {dockerfiles[dockerfile]['image']}, defined in Service: {dockerfiles[dockerfile]['service']}, File: {dockerfiles[dockerfile]['file_path']}"
+                    )
+                else:
+                    dockerfiles[dockerfile] = item
+
 
 def parse_arg():
     parser = argparse.ArgumentParser(
@@ -56,6 +66,12 @@ def main():
     for file_path in args.files:
         check_docker_compose_build_definition(file_path)
     print("SUCCESS: No Conlicts Found.")
+    if errors:
+        for error in errors:
+            print(error)
+        sys.exit(1)
+    else:
+        print("SUCCESS: No Conflicts Found.")
     return 0
 
 

AudioQnA/docker_image_build/build.yaml

@@ -41,12 +41,12 @@ services:
       dockerfile: comps/asr/src/Dockerfile
     extends: audioqna
     image: ${REGISTRY:-opea}/asr:${TAG:-latest}
-  llm-tgi:
+  llm-textgen:
     build:
       context: GenAIComps
       dockerfile: comps/llms/src/text-generation/Dockerfile
     extends: audioqna
-    image: ${REGISTRY:-opea}/llm-tgi:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llm-textgen:${TAG:-latest}
   speecht5-gaudi:
     build:
       context: GenAIComps

AudioQnA/kubernetes/intel/README_gmc.md

@@ -15,7 +15,7 @@ The AudioQnA application is defined as a Custom Resource (CR) file that the abov
 The AudioQnA uses the below prebuilt images if you choose a Xeon deployment
 
 - tgi-service: ghcr.io/huggingface/text-generation-inference:1.4
-- llm: opea/llm-tgi:latest
+- llm: opea/llm-textgen:latest
 - asr: opea/asr:latest
 - whisper: opea/whisper:latest
 - tts: opea/tts:latest

AvatarChatbot/docker_image_build/build.yaml

@@ -29,12 +29,12 @@ services:
       dockerfile: comps/asr/src/Dockerfile
     extends: avatarchatbot
     image: ${REGISTRY:-opea}/asr:${TAG:-latest}
-  llm-tgi:
+  llm-textgen:
     build:
       context: GenAIComps
       dockerfile: comps/llms/src/text-generation/Dockerfile
     extends: avatarchatbot
-    image: ${REGISTRY:-opea}/llm-tgi:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llm-textgen:${TAG:-latest}
   speecht5-gaudi:
     build:
       context: GenAIComps

AvatarChatbot/ui/gradio/app_gradio_demo_avatarchatbot.py

@@ -294,7 +294,7 @@ def initial_process(audio_input, face_input, model_choice):
                 <p style='font-size: 24px;'>OPEA microservices deployed:
                 <ul style='font-size: 24px;'>
                     <li><strong>ASR</strong> (service: opea/whisper-gaudi, model: openai/whisper-small)</li>
-                    <li><strong>LLM 'text-generation'</strong> (service: opea/llm-tgi, model: Intel/neural-chat-7b-v3-3)</li>
+                    <li><strong>LLM 'text-generation'</strong> (service: opea/llm-textgen, model: Intel/neural-chat-7b-v3-3)</li>
                     <li><strong>TTS</strong> (service: opea/speecht5-gaudi, model: microsoft/speecht5_tts)</li>
                     <li><strong>Animation</strong> (service: opea/animation, model: wav2lip+gfpgan)</li>
                 </ul></p>

ChatQnA/docker_compose/intel/hpu/gaudi/how_to_validate_service.md

@@ -44,7 +44,7 @@ CONTAINER ID   IMAGE                                                   COMMAND
 28d9a5570246   opea/chatqna-ui:latest                                  "docker-entrypoint.s…"   2 minutes ago   Up 2 minutes                    0.0.0.0:5173->5173/tcp, :::5173->5173/tcp                                              chatqna-gaudi-ui-server
 bee1132464cd   opea/chatqna:latest                                     "python chatqna.py"      2 minutes ago   Up 2 minutes                    0.0.0.0:8888->8888/tcp, :::8888->8888/tcp                                              chatqna-gaudi-backend-server
 f810f3b4d329   opea/embedding-tei:latest                               "python embedding_te…"   2 minutes ago   Up 2 minutes                    0.0.0.0:6000->6000/tcp, :::6000->6000/tcp                                              embedding-tei-server
-325236a01f9b   opea/llm-tgi:latest                                     "python llm.py"          2 minutes ago   Up 2 minutes                    0.0.0.0:9000->9000/tcp, :::9000->9000/tcp                                              llm-tgi-gaudi-server
+325236a01f9b   opea/llm-textgen:latest                                     "python llm.py"          2 minutes ago   Up 2 minutes                    0.0.0.0:9000->9000/tcp, :::9000->9000/tcp                                              llm-textgen-gaudi-server
 2fa17d84605f   opea/dataprep-redis:latest                              "python prepare_doc_…"   2 minutes ago   Up 2 minutes                    0.0.0.0:6007->6007/tcp, :::6007->6007/tcp                                              dataprep-redis-server
 69e1fb59e92c   opea/retriever-redis:latest                             "/home/user/comps/re…"   2 minutes ago   Up 2 minutes                    0.0.0.0:7000->7000/tcp, :::7000->7000/tcp                                              retriever-redis-server
 313b9d14928a   opea/reranking-tei:latest                               "python reranking_te…"   2 minutes ago   Up 2 minutes                    0.0.0.0:8000->8000/tcp, :::8000->8000/tcp                                              reranking-tei-gaudi-server

ChatQnA/docker_image_build/build.yaml

@@ -71,24 +71,12 @@ services:
       dockerfile: comps/reranks/src/Dockerfile
     extends: chatqna
     image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
-  llm-tgi:
+  llm-textgen:
     build:
       context: GenAIComps
       dockerfile: comps/llms/src/text-generation/Dockerfile
     extends: chatqna
-    image: ${REGISTRY:-opea}/llm-tgi:${TAG:-latest}
-  llm-ollama:
-    build:
-      context: GenAIComps
-      dockerfile: comps/llms/src/text-generation/Dockerfile
-    extends: chatqna
-    image: ${REGISTRY:-opea}/llm-ollama:${TAG:-latest}
-  llm-vllm:
-    build:
-      context: GenAIComps
-      dockerfile: comps/llms/src/text-generation/Dockerfile
-    extends: chatqna
-    image: ${REGISTRY:-opea}/llm-vllm:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llm-textgen:${TAG:-latest}
   dataprep-redis:
     build:
       context: GenAIComps

ChatQnA/kubernetes/intel/cpu/xeon/manifest/chatqna-remote-inference.yaml

@@ -774,7 +774,7 @@ spec:
             runAsUser: 1000
             seccompProfile:
               type: RuntimeDefault
-          image: "opea/llm-vllm:latest"
+          image: "opea/llm-textgen:latest"
           imagePullPolicy: Always
           ports:
             - name: llm-uservice

ChatQnA/kubernetes/intel/hpu/gaudi/manifest/chatqna-vllm-remote-inference.yaml

@@ -682,7 +682,7 @@ spec:
             runAsUser: 1000
             seccompProfile:
               type: RuntimeDefault
-          image: "opea/llm-vllm:latest"
+          image: "opea/llm-textgen:latest"
           imagePullPolicy: Always
           ports:
             - name: llm-uservice

ChatQnA/kubernetes/intel/hpu/gaudi/manifest/chatqna-vllm.yaml

@@ -811,7 +811,7 @@ spec:
             runAsUser: 1000
             seccompProfile:
               type: RuntimeDefault
-          image: "opea/llm-vllm:latest"
+          image: "opea/llm-textgen:latest"
           imagePullPolicy: Always
           ports:
             - name: llm-uservice

CodeGen/docker_compose/amd/gpu/rocm/README.md

@@ -10,7 +10,7 @@ git clone https://github.com/opea-project/GenAIComps.git
 cd GenAIComps
 
 ### Build Docker image
-docker build -t opea/llm-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/src/text-generation/Dockerfile .
+docker build -t opea/llm-textgen:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/src/text-generation/Dockerfile .
 ```
 
 ### Build the MegaService Docker Image

CodeGen/docker_compose/amd/gpu/rocm/compose.yaml

@@ -34,7 +34,7 @@ services:
     ipc: host
     command: --model-id ${CODEGEN_LLM_MODEL_ID} --max-input-length 1024 --max-total-tokens 2048
   codegen-llm-server:
-    image: ${REGISTRY:-opea}/llm-tgi:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llm-textgen:${TAG:-latest}
     container_name: codegen-llm-server
     depends_on:
       codegen-tgi-service:

CodeGen/docker_compose/intel/cpu/xeon/README.md

@@ -19,7 +19,7 @@ Should the Docker image you seek not yet be available on Docker Hub, you can bui
 ```bash
 git clone https://github.com/opea-project/GenAIComps.git
 cd GenAIComps
-docker build -t opea/llm-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/src/text-generation/Dockerfile .
+docker build -t opea/llm-textgen:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/src/text-generation/Dockerfile .
 ```
 
 ### 2. Build the MegaService Docker Image
@@ -43,7 +43,7 @@ docker build -t opea/codegen-ui:latest --build-arg https_proxy=$https_proxy --bu
 
 Then run the command `docker images`, you will have the following 3 Docker Images:
 
-- `opea/llm-tgi:latest`
+- `opea/llm-textgen:latest`
 - `opea/codegen:latest`
 - `opea/codegen-ui:latest`
 
@@ -60,7 +60,7 @@ docker build --no-cache -t opea/codegen-react-ui:latest --build-arg https_proxy=
 
 Then run the command `docker images`, you will have the following 3 Docker Images:
 
-- `opea/llm-tgi:latest`
+- `opea/llm-textgen:latest`
 - `opea/codegen:latest`
 - `opea/codegen-ui:latest`
 - `opea/codegen-react-ui:latest` (optional)

CodeGen/docker_compose/intel/cpu/xeon/compose.yaml

@@ -23,8 +23,8 @@ services:
       retries: 100
     command: --model-id ${LLM_MODEL_ID} --cuda-graphs 0
   llm:
-    image: ${REGISTRY:-opea}/llm-tgi:${TAG:-latest}
-    container_name: llm-tgi-server
+    image: ${REGISTRY:-opea}/llm-textgen:${TAG:-latest}
+    container_name: llm-textgen-server
     depends_on:
       tgi-service:
         condition: service_healthy

CodeGen/docker_compose/intel/hpu/gaudi/README.md

@@ -11,7 +11,7 @@ First of all, you need to build the Docker images locally. This step can be igno
 ```bash
 git clone https://github.com/opea-project/GenAIComps.git
 cd GenAIComps
-docker build -t opea/llm-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/src/text-generation/Dockerfile .
+docker build -t opea/llm-textgen:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/src/text-generation/Dockerfile .
 ```
 
 ### 2. Build the MegaService Docker Image
@@ -46,7 +46,7 @@ docker build --no-cache -t opea/codegen-react-ui:latest --build-arg https_proxy=
 
 Then run the command `docker images`, you will have the following 3 Docker images:
 
-- `opea/llm-tgi:latest`
+- `opea/llm-textgen:latest`
 - `opea/codegen:latest`
 - `opea/codegen-ui:latest`
 - `opea/codegen-react-ui:latest`

CodeGen/docker_compose/intel/hpu/gaudi/compose.yaml

@@ -31,8 +31,8 @@ services:
     ipc: host
     command: --model-id ${LLM_MODEL_ID} --max-input-length 1024 --max-total-tokens 2048
   llm:
-    image: ${REGISTRY:-opea}/llm-tgi:${TAG:-latest}
-    container_name: llm-tgi-gaudi-server
+    image: ${REGISTRY:-opea}/llm-textgen:${TAG:-latest}
+    container_name: llm-textgen-gaudi-server
     depends_on:
       tgi-service:
         condition: service_healthy

CodeGen/docker_image_build/build.yaml

@@ -23,9 +23,9 @@ services:
       dockerfile: ./docker/Dockerfile.react
     extends: codegen
     image: ${REGISTRY:-opea}/codegen-react-ui:${TAG:-latest}
-  llm-tgi:
+  llm-textgen:
     build:
       context: GenAIComps
       dockerfile: comps/llms/src/text-generation/Dockerfile
     extends: codegen
-    image: ${REGISTRY:-opea}/llm-tgi:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llm-textgen:${TAG:-latest}

CodeGen/kubernetes/intel/cpu/xeon/manifest/codegen.yaml

@@ -325,7 +325,7 @@ spec:
             runAsUser: 1000
             seccompProfile:
               type: RuntimeDefault
-          image: "opea/llm-tgi:latest"
+          image: "opea/llm-textgen:latest"
           imagePullPolicy: IfNotPresent
           ports:
             - name: llm-uservice

CodeGen/kubernetes/intel/cpu/xeon/manifest/codegen_react_ui.yaml

@@ -179,7 +179,7 @@ spec:
             - name: no_proxy
               value:
           securityContext: {}
-          image: "opea/llm-tgi:latest"
+          image: "opea/llm-textgen:latest"
           imagePullPolicy: IfNotPresent
           ports:
             - name: llm-uservice

CodeGen/kubernetes/intel/hpu/gaudi/manifest/codegen.yaml

@@ -326,7 +326,7 @@ spec:
             runAsUser: 1000
             seccompProfile:
               type: RuntimeDefault
-          image: "opea/llm-tgi:latest"
+          image: "opea/llm-textgen:latest"
           imagePullPolicy: IfNotPresent
           ports:
             - name: llm-uservice

CodeGen/tests/test_compose_on_gaudi.sh

@@ -19,7 +19,7 @@ function build_docker_images() {
     git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
 
     echo "Build all the images with --no-cache, check docker_image_build.log for details..."
-    service_list="codegen codegen-ui llm-tgi"
+    service_list="codegen codegen-ui llm-textgen"
     docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
 
     docker pull ghcr.io/huggingface/tgi-gaudi:2.0.6
@@ -94,7 +94,7 @@ function validate_microservices() {
         "${ip_address}:9000/v1/chat/completions" \
         "data: " \
         "llm" \
-        "llm-tgi-gaudi-server" \
+        "llm-textgen-gaudi-server" \
         '{"query":"def print_hello_world():"}'
 
 }

CodeGen/tests/test_compose_on_rocm.sh

@@ -19,7 +19,7 @@ function build_docker_images() {
     git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
 
     echo "Build all the images with --no-cache, check docker_image_build.log for details..."
-    service_list="codegen codegen-ui llm-tgi"
+    service_list="codegen codegen-ui llm-textgen"
     docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
 
     docker pull ghcr.io/huggingface/text-generation-inference:2.4.0-intel-cpu

CodeGen/tests/test_compose_on_xeon.sh

@@ -19,7 +19,7 @@ function build_docker_images() {
     git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
 
     echo "Build all the images with --no-cache, check docker_image_build.log for details..."
-    service_list="codegen codegen-ui llm-tgi"
+    service_list="codegen codegen-ui llm-textgen"
     docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
 
     docker pull ghcr.io/huggingface/text-generation-inference:2.4.0-intel-cpu
@@ -95,7 +95,7 @@ function validate_microservices() {
         "${ip_address}:9000/v1/chat/completions" \
         "data: " \
         "llm" \
-        "llm-tgi-server" \
+        "llm-textgen-server" \
         '{"query":"def print_hello_world():"}'
 
 }

CodeTrans/docker_compose/amd/gpu/rocm/README.md

@@ -10,7 +10,7 @@ git clone https://github.com/opea-project/GenAIComps.git
 cd GenAIComps
 
 ### Build Docker image
-docker build -t opea/llm-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/src/text-generation/Dockerfile .
+docker build -t opea/llm-textgen:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/src/text-generation/Dockerfile .
 ```
 
 ### Build the MegaService Docker Image

CodeTrans/docker_compose/amd/gpu/rocm/compose.yaml

@@ -35,7 +35,7 @@ services:
     ipc: host
     command: --model-id ${CODETRANS_LLM_MODEL_ID}
   codetrans-llm-server:
-    image: ${REGISTRY:-opea}/llm-tgi:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llm-textgen:${TAG:-latest}
     container_name: codetrans-llm-server
     depends_on:
       codetrans-tgi-service:

CodeTrans/docker_compose/intel/cpu/xeon/README.md

@@ -19,7 +19,7 @@ First of all, you need to build Docker Images locally and install the python pac
 ```bash
 git clone https://github.com/opea-project/GenAIComps.git
 cd GenAIComps
-docker build -t opea/llm-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/src/text-generation/Dockerfile .
+docker build -t opea/llm-textgen:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/src/text-generation/Dockerfile .
 ```
 
 ### 2. Build MegaService Docker Image
@@ -46,7 +46,7 @@ docker build -t opea/nginx:latest --build-arg https_proxy=$https_proxy --build-a
 
 Then run the command `docker images`, you will have the following Docker Images:
 
-- `opea/llm-tgi:latest`
+- `opea/llm-textgen:latest`
 - `opea/codetrans:latest`
 - `opea/codetrans-ui:latest`
 - `opea/nginx:latest`

CodeTrans/docker_compose/intel/cpu/xeon/compose.yaml

@@ -23,8 +23,8 @@ services:
       retries: 100
     command: --model-id ${LLM_MODEL_ID} --cuda-graphs 0
   llm:
-    image: ${REGISTRY:-opea}/llm-tgi:${TAG:-latest}
-    container_name: llm-tgi-server
+    image: ${REGISTRY:-opea}/llm-textgen:${TAG:-latest}
+    container_name: llm-textgen-server
     depends_on:
       tgi-service:
         condition: service_healthy

CodeTrans/docker_compose/intel/hpu/gaudi/README.md

@@ -11,7 +11,7 @@ First of all, you need to build Docker Images locally and install the python pac
 ```bash
 git clone https://github.com/opea-project/GenAIComps.git
 cd GenAIComps
-docker build -t opea/llm-tgi:latest --no-cache --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/src/text-generation/Dockerfile .
+docker build -t opea/llm-textgen:latest --no-cache --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/src/text-generation/Dockerfile .
 ```
 
 ### 2. Build MegaService Docker Image
@@ -38,7 +38,7 @@ docker build -t opea/nginx:latest --build-arg https_proxy=$https_proxy --build-a
 
 Then run the command `docker images`, you will have the following Docker Images:
 
-- `opea/llm-tgi:latest`
+- `opea/llm-textgen:latest`
 - `opea/codetrans:latest`
 - `opea/codetrans-ui:latest`
 - `opea/nginx:latest`