From cd4cf5f3cdb31a85025e4425c4e3b9fbcd139edf Mon Sep 17 00:00:00 2001 From: lvliang-intel Date: Tue, 10 Dec 2024 09:45:11 +0800 Subject: [PATCH] update dockerfile path Signed-off-by: lvliang-intel --- .github/workflows/docker/compose/embeddings-compose.yaml | 8 ++++---- comps/embeddings/native/multimodal/bridgetower/README.md | 4 ++-- .../docker_compose_bridgetower_embedding_intel_hpu.yaml | 2 +- ...test_embeddings_multimodal_bridgetower_on_intel_hpu.sh | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker/compose/embeddings-compose.yaml b/.github/workflows/docker/compose/embeddings-compose.yaml index 417a005c6..0e3df0712 100644 --- a/.github/workflows/docker/compose/embeddings-compose.yaml +++ b/.github/workflows/docker/compose/embeddings-compose.yaml @@ -9,15 +9,15 @@ services: image: ${REGISTRY:-opea}/embedding-tei:${TAG:-latest} embedding-multimodal-clip: build: - dockerfile: comps/embeddings/multimodal_clip/Dockerfile + dockerfile: comps/embeddings/native/multimodal/clip/Dockerfile image: ${REGISTRY:-opea}/embedding-multimodal-clip:${TAG:-latest} embedding-multimodal-bridgetower: build: - dockerfile: comps/embeddings/multimodal/bridgetower/Dockerfile + dockerfile: comps/embeddings/native/multimodal/bridgetower/dependency/Dockerfile image: ${REGISTRY:-opea}/embedding-multimodal-bridgetower:${TAG:-latest} embedding-multimodal: build: - dockerfile: comps/embeddings/multimodal/multimodal_langchain/Dockerfile + dockerfile: comps/embeddings/native/multimodal/bridgetower/wrapper/Dockerfile image: ${REGISTRY:-opea}/embedding-multimodal:${TAG:-latest} embedding-langchain-mosec-endpoint: build: @@ -33,7 +33,7 @@ services: image: ${REGISTRY:-opea}/embedding-tei-llama-index:${TAG:-latest} embedding-multimodal-bridgetower-gaudi: build: - dockerfile: comps/embeddings/multimodal/bridgetower/Dockerfile.intel_hpu + dockerfile: comps/embeddings/native/multimodal/bridgetower/dependency/Dockerfile.intel_hpu image: ${REGISTRY:-opea}/embedding-multimodal-bridgetower-gaudi:${TAG:-latest} embedding-predictionguard: build: diff --git a/comps/embeddings/native/multimodal/bridgetower/README.md b/comps/embeddings/native/multimodal/bridgetower/README.md index b71d753f7..d77b5d8e5 100644 --- a/comps/embeddings/native/multimodal/bridgetower/README.md +++ b/comps/embeddings/native/multimodal/bridgetower/README.md @@ -52,7 +52,7 @@ Currently, we employ [**BridgeTower**](https://huggingface.co/BridgeTower/bridge ```bash cd ../../../../../../ -docker build -t opea/embedding-multimodal-bridgetower-hpu:latest --build-arg EMBEDDER_PORT=$EMBEDDER_PORT --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/native/multimodal/bridgetower/dependency/Dockerfile.intel_hpu . +docker build -t opea/embedding-multimodal-bridgetower-gaudi:latest --build-arg EMBEDDER_PORT=$EMBEDDER_PORT --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/native/multimodal/bridgetower/dependency/Dockerfile.intel_hpu . cd comps/embeddings/native/multimodal/bridgetower/dependency/ docker compose -f docker_compose_bridgetower_embedding_intel_hpu.yaml up -d ``` @@ -116,7 +116,7 @@ Currently, we employ [**BridgeTower**](https://huggingface.co/BridgeTower/bridge ```bash cd ../../../../../../ -docker build -t opea/embedding-multimodal-bridgetower-hpu:latest --build-arg EMBEDDER_PORT=$EMBEDDER_PORT --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/native/multimodal/bridgetower/dependency/Dockerfile.intel_hpu . +docker build -t opea/embedding-multimodal-bridgetower-gaudi:latest --build-arg EMBEDDER_PORT=$EMBEDDER_PORT --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/native/multimodal/bridgetower/dependency/Dockerfile.intel_hpu . cd comps/embeddings/native/multimodal/bridgetower/dependency/ docker compose -f docker_compose_bridgetower_embedding_intel_hpu.yaml up -d ``` diff --git a/comps/embeddings/native/multimodal/bridgetower/dependency/docker_compose_bridgetower_embedding_intel_hpu.yaml b/comps/embeddings/native/multimodal/bridgetower/dependency/docker_compose_bridgetower_embedding_intel_hpu.yaml index b21b4b64b..80be71fd5 100644 --- a/comps/embeddings/native/multimodal/bridgetower/dependency/docker_compose_bridgetower_embedding_intel_hpu.yaml +++ b/comps/embeddings/native/multimodal/bridgetower/dependency/docker_compose_bridgetower_embedding_intel_hpu.yaml @@ -3,7 +3,7 @@ services: embedding-multimodal-bridgetower: - image: opea/embedding-multimodal-bridgetower-hpu:latest + image: opea/embedding-multimodal-bridgetower-gaudi:latest container_name: embedding-multimodal-bridgetower ports: - ${EMBEDDER_PORT}:${EMBEDDER_PORT} diff --git a/tests/embeddings/test_embeddings_multimodal_bridgetower_on_intel_hpu.sh b/tests/embeddings/test_embeddings_multimodal_bridgetower_on_intel_hpu.sh index 41cde7316..b21143a33 100644 --- a/tests/embeddings/test_embeddings_multimodal_bridgetower_on_intel_hpu.sh +++ b/tests/embeddings/test_embeddings_multimodal_bridgetower_on_intel_hpu.sh @@ -16,13 +16,13 @@ unset http_proxy function build_mmei_docker_images() { cd $WORKPATH echo $(pwd) - docker build --no-cache -t opea/embedding-multimodal-bridgetower-hpu:latest --build-arg EMBEDDER_PORT=$EMBEDDER_PORT --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/native/multimodal/bridgetower/dependency/Dockerfile.intel_hpu . + docker build --no-cache -t opea/embedding-multimodal-bridgetower-gaudi:latest --build-arg EMBEDDER_PORT=$EMBEDDER_PORT --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/native/multimodal/bridgetower/dependency/Dockerfile.intel_hpu . if [ $? -ne 0 ]; then - echo "opea/embedding-multimodal-bridgetower-hpu built fail" + echo "opea/embedding-multimodal-bridgetower-gaudi built fail" exit 1 else - echo "opea/embedding-multimodal-bridgetower-hpu built successful" + echo "opea/embedding-multimodal-bridgetower-gaudi built successful" fi }