Change image tag. (#601)

* Change image tag. Signed-off-by: zepan <[email protected]> * Change tag in workflow. Signed-off-by: zepan <[email protected]> * Remove the CD portion of the retriever. Signed-off-by: zepan <[email protected]> * Update lvms-compose-cd.yaml Change '_' to '-'. * Update lvms-compose-cd.yaml * Update llms-compose-cd.yaml * Add images. Signed-off-by: zepan <[email protected]> --------- Signed-off-by: zepan <[email protected]>
opea-project · Sep 4, 2024 · 2093558 · 2093558
1 parent f510b69
commit 2093558
Show file tree

Hide file tree

Showing 24 changed files with 76 additions and 62 deletions.
diff --git a/.github/workflows/_comps-workflow.yml b/.github/workflows/_comps-workflow.yml
@@ -65,6 +65,7 @@ jobs:
             echo "file_exists=false" >> $GITHUB_OUTPUT
           fi
 
+          cd ${{ github.workspace }}
           if [[ $(grep -c "llava-tgi:" ${docker_compose_yml}) != 0 ]]; then
               git clone https://github.com/yuanwu2017/tgi-gaudi.git && cd tgi-gaudi && git checkout v2.0.4
           fi

diff --git a/.github/workflows/docker/compose/agent-compose-cd.yaml b/.github/workflows/docker/compose/agent-compose-cd.yaml
@@ -6,4 +6,4 @@ services:
   comps-agent-langchain:
     build:
       dockerfile: comps/agent/langchain/docker/Dockerfile
-    image: ${REGISTRY}opea/comps-agent-langchain:${TAG:-latest}
+    image: ${REGISTRY:-opea}/comps-agent-langchain:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/asr-compose.yaml b/.github/workflows/docker/compose/asr-compose.yaml
@@ -7,12 +7,12 @@ services:
   asr:
     build:
       dockerfile: comps/asr/Dockerfile
-    image: ${REGISTRY}opea/asr:${TAG:-latest}
+    image: ${REGISTRY:-opea}/asr:${TAG:-latest}
   whisper:
     build:
       dockerfile: comps/asr/whisper/Dockerfile
-    image: ${REGISTRY}opea/whisper:${TAG:-latest}
+    image: ${REGISTRY:-opea}/whisper:${TAG:-latest}
   whisper-gaudi:
     build:
       dockerfile: comps/asr/whisper/Dockerfile_hpu
-    image: ${REGISTRY}opea/whisper-gaudi:${TAG:-latest}
+    image: ${REGISTRY:-opea}/whisper-gaudi:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/chathistory-compose-cd.yaml b/.github/workflows/docker/compose/chathistory-compose-cd.yaml
@@ -6,4 +6,4 @@ services:
   chathistory-mongo-server:
     build:
       dockerfile: comps/chathistory/mongo/docker/Dockerfile
-    image: ${REGISTRY}opea/chathistory-mongo-server:${TAG:-latest}
+    image: ${REGISTRY:-opea}/chathistory-mongo-server:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/dataprep-compose-cd.yaml b/.github/workflows/docker/compose/dataprep-compose-cd.yaml
@@ -6,20 +6,20 @@ services:
   dataprep-redis-llama-index:
     build:
       dockerfile: comps/dataprep/redis/llama_index/docker/Dockerfile
-    image: ${REGISTRY}opea/dataprep-redis-llama-index:${TAG:-latest}
+    image: ${REGISTRY:-opea}/dataprep-redis-llama-index:${TAG:-latest}
   dataprep-on-ray-redis:
     build:
       dockerfile: comps/dataprep/redis/langchain_ray/docker/Dockerfile
-    image: ${REGISTRY}opea/dataprep-on-ray-redis:${TAG:-latest}
+    image: ${REGISTRY:-opea}/dataprep-on-ray-redis:${TAG:-latest}
   dataprep-milvus:
     build:
       dockerfile: comps/dataprep/milvus/docker/Dockerfile
-    image: ${REGISTRY}opea/dataprep-milvus:${TAG:-latest}
+    image: ${REGISTRY:-opea}/dataprep-milvus:${TAG:-latest}
   dataprep-pgvector:
     build:
       dockerfile: comps/dataprep/pgvector/langchain/docker/Dockerfile
-    image: ${REGISTRY}opea/dataprep-pgvector:${TAG:-latest}
+    image: ${REGISTRY:-opea}/dataprep-pgvector:${TAG:-latest}
   dataprep-pinecone:
     build:
       dockerfile: comps/dataprep/pinecone/docker/Dockerfile
-    image: ${REGISTRY}opea/dataprep-pinecone:${TAG:-latest}
+    image: ${REGISTRY:-opea}/dataprep-pinecone:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/dataprep-compose.yaml b/.github/workflows/docker/compose/dataprep-compose.yaml
@@ -8,8 +8,8 @@ services:
   dataprep-redis:
     build:
       dockerfile: comps/dataprep/redis/langchain/docker/Dockerfile
-    image: ${REGISTRY}opea/dataprep-redis:${TAG:-latest}
+    image: ${REGISTRY:-opea}/dataprep-redis:${TAG:-latest}
   dataprep-qdrant:
     build:
       dockerfile: comps/dataprep/qdrant/docker/Dockerfile
-    image: ${REGISTRY}opea/dataprep-qdrant:${TAG:-latest}
+    image: ${REGISTRY:-opea}/dataprep-qdrant:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/embeddings-compose-cd.yaml b/.github/workflows/docker/compose/embeddings-compose-cd.yaml
@@ -5,12 +5,12 @@ services:
   embedding-langchain-mosec-endpoint:
     build:
       dockerfile: comps/embeddings/langchain-mosec/mosec-docker/Dockerfile
-    image: ${REGISTRY}opea/embedding-langchain-mosec-endpoint:${TAG:-latest}
+    image: ${REGISTRY:-opea}/embedding-langchain-mosec-endpoint:${TAG:-latest}
   embedding-langchain-mosec:
     build:
       dockerfile: comps/embeddings/langchain-mosec/docker/Dockerfile
-    image: ${REGISTRY}opea/embedding-langchain-mosec:${TAG:-latest}
+    image: ${REGISTRY:-opea}/embedding-langchain-mosec:${TAG:-latest}
   embedding-tei-llama-index:
     build:
       dockerfile: comps/embeddings/llama_index/docker/Dockerfile
-    image: ${REGISTRY}opea/embedding-tei-llama-index:${TAG:-latest}
+    image: ${REGISTRY:-opea}/embedding-tei-llama-index:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/embeddings-compose.yaml b/.github/workflows/docker/compose/embeddings-compose.yaml
@@ -7,4 +7,4 @@ services:
   embedding-tei:
     build:
       dockerfile: comps/embeddings/langchain/docker/Dockerfile
-    image: ${REGISTRY}opea/embedding-tei:${TAG:-latest}
+    image: ${REGISTRY:-opea}/embedding-tei:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/guardrails-compose-cd.yaml b/.github/workflows/docker/compose/guardrails-compose-cd.yaml
@@ -5,4 +5,4 @@ services:
   guardrails-pii-detection:
     build:
       dockerfile: comps/guardrails/pii_detection/docker/Dockerfile
-    image: ${REGISTRY}opea/guardrails-pii-detection:${TAG:-latest}
+    image: ${REGISTRY:-opea}/guardrails-pii-detection:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/guardrails-compose.yaml b/.github/workflows/docker/compose/guardrails-compose.yaml
@@ -8,4 +8,4 @@ services:
   guardrails-tgi:
     build:
       dockerfile: comps/guardrails/llama_guard/docker/Dockerfile
-    image: ${REGISTRY}opea/guardrails-tgi:${TAG:-latest}
+    image: ${REGISTRY:-opea}/guardrails-tgi:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/llms-compose-cd.yaml b/.github/workflows/docker/compose/llms-compose-cd.yaml
@@ -5,4 +5,8 @@ services:
   llm-native:
     build:
       dockerfile: comps/llms/text-generation/native/docker/Dockerfile
-    image: ${REGISTRY}opea/llm-native:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llm-native:${TAG:-latest}
+  vllm-openvino:
+    build:
+      dockerfile: vllm-openvino/Dockerfile.openvino
+    image: ${REGISTRY:-opea}/vllm-openvino:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/llms-compose.yaml b/.github/workflows/docker/compose/llms-compose.yaml
@@ -7,32 +7,32 @@ services:
   llm-tgi:
     build:
       dockerfile: comps/llms/text-generation/tgi/Dockerfile
-    image: ${REGISTRY}opea/llm-tgi:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llm-tgi:${TAG:-latest}
   llm-ollama:
     build:
       dockerfile: comps/llms/text-generation/ollama/Dockerfile
-    image: ${REGISTRY}opea/llm-ollama:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llm-ollama:${TAG:-latest}
   llm-docsum-tgi:
     build:
       dockerfile: comps/llms/summarization/tgi/Dockerfile
-    image: ${REGISTRY}opea/llm-docsum-tgi:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llm-docsum-tgi:${TAG:-latest}
   llm-faqgen-tgi:
     build:
       dockerfile: comps/llms/faq-generation/tgi/Dockerfile
-    image: ${REGISTRY}opea/llm-faqgen-tgi:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llm-faqgen-tgi:${TAG:-latest}
   llm-vllm:
     build:
       dockerfile: comps/llms/text-generation/vllm/docker/Dockerfile.microservice
-    image: ${REGISTRY}opea/llm-vllm:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llm-vllm:${TAG:-latest}
   llm-vllm-hpu:
     build:
       dockerfile: comps/llms/text-generation/vllm/docker/Dockerfile.hpu
-    image: ${REGISTRY}opea/llm-vllm-hpu:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llm-vllm-hpu:${TAG:-latest}
   llm-vllm-ray:
     build:
       dockerfile: comps/llms/text-generation/vllm-ray/docker/Dockerfile.microservice
-    image: ${REGISTRY}opea/llm-vllm-ray:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llm-vllm-ray:${TAG:-latest}
   llm-vllm-ray-hpu:
     build:
       dockerfile: comps/llms/text-generation/vllm-ray/docker/Dockerfile.vllmray
-    image: ${REGISTRY}opea/llm-vllm-ray-hpu:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llm-vllm-ray-hpu:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/lvms-compose-cd.yaml b/.github/workflows/docker/compose/lvms-compose-cd.yaml
@@ -6,18 +6,22 @@ services:
   lvm:
     build:
       dockerfile: comps/lvms/Dockerfile
-    image: ${REGISTRY}opea/lvm:${TAG:-latest}
+    image: ${REGISTRY:-opea}/lvm:${TAG:-latest}
   # Xeon CPU
   llava:
     build:
       dockerfile: comps/lvms/llava/Dockerfile
-    image: ${REGISTRY}opea/llava:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llava:${TAG:-latest}
   # Gaudi2 HPU
   llava_hpu:
     build:
       dockerfile: comps/lvms/llava/Dockerfile_hpu
-    image: ${REGISTRY}opea/llava_hpu:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llava-hpu:${TAG:-latest}
   lvm-tgi:
     build:
       dockerfile: comps/lvms/Dockerfile_tgi
-    image: ${REGISTRY}opea/lvm-tgi:${TAG:-latest}
+    image: ${REGISTRY:-opea}/lvm-tgi:${TAG:-latest}
+  llava-tgi:
+    build:
+      dockerfile: tgi-gaudi/Dockerfile
+    image: ${REGISTRY:-opea}/llava-tgi:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/nginx-compose-cd.yaml b/.github/workflows/docker/compose/nginx-compose-cd.yaml
@@ -6,4 +6,4 @@ services:
   nginx:
     build:
       dockerfile: comps/nginx/docker/Dockerfile
-    image: ${REGISTRY}opea/nginx:${TAG:-latest}
+    image: ${REGISTRY:-opea}/nginx:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/prompt_registry-compose-cd.yaml b/.github/workflows/docker/compose/prompt_registry-compose-cd.yaml
@@ -6,4 +6,4 @@ services:
   promptregistry-mongo-server:
     build:
       dockerfile: comps/prompt_registry/mongo/docker/Dockerfile
-    image: ${REGISTRY}opea/promptregistry-mongo-server:${TAG:-latest}
+    image: ${REGISTRY:-opea}/promptregistry-mongo-server:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/reranks-compose-cd.yaml b/.github/workflows/docker/compose/reranks-compose-cd.yaml
@@ -5,12 +5,12 @@ services:
   reranking-fastrag:
     build:
       dockerfile: comps/reranks/fastrag/docker/Dockerfile
-    image: ${REGISTRY}opea/reranking-fastrag:${TAG:-latest}
+    image: ${REGISTRY:-opea}/reranking-fastrag:${TAG:-latest}
   reranking-langchain-mosec-endpoint:
     build:
       dockerfile: comps/reranks/langchain-mosec/mosec-docker/Dockerfile
-    image: ${REGISTRY}opea/reranking-langchain-mosec-endpoint:${TAG:-latest}
+    image: ${REGISTRY:-opea}/reranking-langchain-mosec-endpoint:${TAG:-latest}
   reranking-langchain-mosec:
     build:
       dockerfile: comps/reranks/langchain-mosec/docker/Dockerfile
-    image: ${REGISTRY}opea/reranking-langchain-mosec:${TAG:-latest}
+    image: ${REGISTRY:-opea}/reranking-langchain-mosec:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/reranks-compose.yaml b/.github/workflows/docker/compose/reranks-compose.yaml
@@ -7,4 +7,4 @@ services:
   reranking-tei:
     build:
       dockerfile: comps/reranks/tei/docker/Dockerfile
-    image: ${REGISTRY}opea/reranking-tei:${TAG:-latest}
+    image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/retrievers-compose-cd.yaml b/.github/workflows/docker/compose/retrievers-compose-cd.yaml
@@ -0,0 +1,21 @@
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+# this file should be run in the root of the repo
+services:
+  retriever-pgvector:
+    build:
+      dockerfile: comps/retrievers/langchain/pgvector/docker/Dockerfile
+    image: ${REGISTRY:-opea}/retriever-qdrant:${TAG:-latest}
+  retriever-pinecone:
+    build:
+      dockerfile: comps/retrievers/langchain/pinecone/docker/Dockerfile
+    image: ${REGISTRY:-opea}/retriever-pinecone:${TAG:-latest}
+  retriever-milvus:
+    build:
+      dockerfile: comps/retrievers/langchain/milvus/docker/Dockerfile
+    image: ${REGISTRY:-opea}/retriever-milvus:${TAG:-latest}
+  retriever-redis-llamaindex:
+    build:
+      dockerfile: comps/retrievers/llamaindex/docker/Dockerfile
+    image: ${REGISTRY:-opea}/retriever-redis-llamaindex:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/retrievers-compose.yaml b/.github/workflows/docker/compose/retrievers-compose.yaml
@@ -6,24 +6,8 @@ services:
   retriever-redis:
     build:
       dockerfile: comps/retrievers/langchain/redis/docker/Dockerfile
-    image: ${REGISTRY}opea/retriever-redis:${TAG:-latest}
+    image: ${REGISTRY:-opea}/retriever-redis:${TAG:-latest}
   retriever-qdrant:
     build:
       dockerfile: comps/retrievers/haystack/qdrant/docker/Dockerfile
-    image: ${REGISTRY}opea/retriever-qdrant:${TAG:-latest}
-  retriever-pgvector:
-    build:
-      dockerfile: comps/retrievers/langchain/pgvector/docker/Dockerfile
-    image: ${REGISTRY}opea/retriever-qdrant:${TAG:-latest}
-  retriever-pinecone:
-    build:
-      dockerfile: comps/retrievers/langchain/pinecone/docker/Dockerfile
-    image: ${REGISTRY}opea/retriever-pinecone:${TAG:-latest}
-  retriever-milvus:
-    build:
-      dockerfile: comps/retrievers/langchain/milvus/docker/Dockerfile
-    image: ${REGISTRY}opea/retriever-milvus:${TAG:-latest}
-  retriever-redis-llamaindex:
-    build:
-      dockerfile: comps/retrievers/llamaindex/docker/Dockerfile
-    image: ${REGISTRY}opea/retriever-redis-llamaindex:${TAG:-latest}
+    image: ${REGISTRY:-opea}/retriever-qdrant:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/tts-compose.yaml b/.github/workflows/docker/compose/tts-compose.yaml
@@ -7,12 +7,12 @@ services:
   tts:
     build:
       dockerfile: comps/tts/Dockerfile
-    image: ${REGISTRY}opea/tts:${TAG:-latest}
+    image: ${REGISTRY:-opea}/tts:${TAG:-latest}
   speecht5:
     build:
       dockerfile: comps/tts/speecht5/Dockerfile
-    image: ${REGISTRY}opea/speecht5:${TAG:-latest}
+    image: ${REGISTRY:-opea}/speecht5:${TAG:-latest}
   speecht5-gaudi:
     build:
       dockerfile: comps/tts/speecht5/Dockerfile_hpu
-    image: ${REGISTRY}opea/speecht5-gaudi:${TAG:-latest}
+    image: ${REGISTRY:-opea}/speecht5-gaudi:${TAG:-latest}
diff --git a/.github/workflows/docker/compose/web_retrievers-compose.yaml b/.github/workflows/docker/compose/web_retrievers-compose.yaml
@@ -7,4 +7,4 @@ services:
   web-retriever-chroma:
     build:
       dockerfile: comps/web_retrievers/langchain/chroma/docker/Dockerfile
-    image: ${REGISTRY}opea/web-retriever-chroma:${TAG:-latest}
+    image: ${REGISTRY:-opea}/web-retriever-chroma:${TAG:-latest}
diff --git a/.github/workflows/manual-image-build.yml b/.github/workflows/manual-image-build.yml
@@ -63,5 +63,5 @@ jobs:
         with:
           work_dir: ${{ github.workspace }}
           docker_compose_path: ${{ github.workspace }}/.github/workflows/docker/compose/${service}-compose.yaml
-          registry: ${OPEA_IMAGE_REPO}
+          registry: ${OPEA_IMAGE_REPO}opea
           tag: ${{ github.event.inputs.tag }}
diff --git a/.github/workflows/push-image-build.yml b/.github/workflows/push-image-build.yml
@@ -72,4 +72,4 @@ jobs:
         with:
           work_dir: ${{ github.workspace }}
           docker_compose_path: ${{ env.docker_compose_path }}
-          registry: ${OPEA_IMAGE_REPO}
+          registry: ${OPEA_IMAGE_REPO}opea
diff --git a/.github/workflows/schedule-image-build.yml b/.github/workflows/schedule-image-build.yml
@@ -59,5 +59,5 @@ jobs:
         with:
           work_dir: ${{ github.workspace }}
           docker_compose_path: ${{ github.workspace }}/.github/workflows/docker/compose/${service}-compose.yaml
-          registry: ${OPEA_IMAGE_REPO}
+          registry: ${OPEA_IMAGE_REPO}opea
           tag: ${tag}