From 9527b4ded3a2cc93a8693a43999c93b1af03603a Mon Sep 17 00:00:00 2001 From: chensuyue Date: Fri, 24 Jan 2025 18:29:03 +0800 Subject: [PATCH 1/2] align image name with GenAIExamples Signed-off-by: chensuyue --- .github/workflows/docker/compose/chathistory-compose.yaml | 4 ++-- .github/workflows/manual-docker-publish.yml | 2 +- comps/chathistory/deployment/docker_compose/compose.yaml | 2 +- comps/chathistory/src/README.md | 2 +- tests/chathistory/test_chathistory_mongo.sh | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker/compose/chathistory-compose.yaml b/.github/workflows/docker/compose/chathistory-compose.yaml index d3f35db8e6..3991a99734 100644 --- a/.github/workflows/docker/compose/chathistory-compose.yaml +++ b/.github/workflows/docker/compose/chathistory-compose.yaml @@ -3,7 +3,7 @@ # this file should be run in the root of the repo services: - chathistory-mongo: + chathistory-mongo-server: build: dockerfile: comps/chathistory/src/Dockerfile - image: ${REGISTRY:-opea}/chathistory-mongo:${TAG:-latest} + image: ${REGISTRY:-opea}/chathistory-mongo-server:${TAG:-latest} diff --git a/.github/workflows/manual-docker-publish.yml b/.github/workflows/manual-docker-publish.yml index c426a1300f..b72133ce5c 100644 --- a/.github/workflows/manual-docker-publish.yml +++ b/.github/workflows/manual-docker-publish.yml @@ -12,7 +12,7 @@ on: type: string images: default: "" - description: "List of images to scan [dataprep-pgvector,dataprep-pinecone...]" + description: "List of images to publish [dataprep-pgvector,dataprep-pinecone...]" required: false type: string tag: diff --git a/comps/chathistory/deployment/docker_compose/compose.yaml b/comps/chathistory/deployment/docker_compose/compose.yaml index 0e0a5c9ad2..db9812e692 100644 --- a/comps/chathistory/deployment/docker_compose/compose.yaml +++ b/comps/chathistory/deployment/docker_compose/compose.yaml @@ -15,7 +15,7 @@ services: command: mongod --quiet --logpath /dev/null chathistory-mongo: - image: ${REGISTRY:-opea}/chathistory-mongo:${TAG:-latest} + image: ${REGISTRY:-opea}/chathistory-mongo-server:${TAG:-latest} container_name: chathistory-mongo-server ports: - "${CHATHISTORY_PORT:-6012}:6012" diff --git a/comps/chathistory/src/README.md b/comps/chathistory/src/README.md index 3cdf5bf270..5d753fdec3 100644 --- a/comps/chathistory/src/README.md +++ b/comps/chathistory/src/README.md @@ -23,7 +23,7 @@ export COLLECTION_NAME=${COLLECTION_NAME} ```bash cd ../../../../ -docker build -t opea/chathistory-mongo:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/chathistory/src/Dockerfile . +docker build -t opea/chathistory-mongo-server:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/chathistory/src/Dockerfile . ``` ### Run Docker with CLI diff --git a/tests/chathistory/test_chathistory_mongo.sh b/tests/chathistory/test_chathistory_mongo.sh index 4bb098d79c..9f32165be7 100644 --- a/tests/chathistory/test_chathistory_mongo.sh +++ b/tests/chathistory/test_chathistory_mongo.sh @@ -16,12 +16,12 @@ function build_docker_images() { cd $WORKPATH echo $(pwd) - docker build --no-cache -t opea/chathistory-mongo:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/chathistory/src/Dockerfile . + docker build --no-cache -t opea/chathistory-mongo-server:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/chathistory/src/Dockerfile . if [ $? -ne 0 ]; then - echo "opea/chathistory-mongo built fail" + echo "opea/chathistory-mongo-server built fail" exit 1 else - echo "opea/chathistory-mongo built successful" + echo "opea/chathistory-mongo-server built successful" fi } From f7cb1f75a0724850c79ebb90db998964bc939aac Mon Sep 17 00:00:00 2001 From: chensuyue Date: Fri, 24 Jan 2025 20:45:57 +0800 Subject: [PATCH 2/2] update docker publish workflow Signed-off-by: chensuyue --- .github/workflows/manual-docker-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/manual-docker-publish.yml b/.github/workflows/manual-docker-publish.yml index b72133ce5c..b7e770dedb 100644 --- a/.github/workflows/manual-docker-publish.yml +++ b/.github/workflows/manual-docker-publish.yml @@ -45,6 +45,7 @@ jobs: strategy: matrix: image: ${{ fromJSON(needs.get-image-list.outputs.matrix) }} + fail-fast: false runs-on: "docker-build-gaudi" steps: - uses: docker/login-action@v3.2.0