From 6b24e07d03fc5ca85526b3b65d7db7c2774db8b8 Mon Sep 17 00:00:00 2001 From: binbin lv Date: Tue, 6 Aug 2024 16:57:20 +0800 Subject: [PATCH] Modify the docker compose command Signed-off-by: binbin lv --- .github/workflows/CI_es_milvus2x_main.yaml | 4 ++-- .github/workflows/CI_faiss_milvus2x_main.yaml | 4 ++-- .github/workflows/CI_milvus1x_milvus2x_main.yaml | 4 ++-- .../CI_milvus1x_milvus2x_specify_config_main.yaml | 4 ++-- scripts/check_healthy.sh | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/CI_es_milvus2x_main.yaml b/.github/workflows/CI_es_milvus2x_main.yaml index d81b811..202b064 100644 --- a/.github/workflows/CI_es_milvus2x_main.yaml +++ b/.github/workflows/CI_es_milvus2x_main.yaml @@ -96,9 +96,9 @@ jobs: shell: bash working-directory: deployment/${{ matrix.milvus_2_x_mode }} run: | - docker-compose up -d + docker compose up -d bash ../../scripts/check_healthy.sh - docker-compose ps -a + docker compose ps -a - name: Prepare config shell: bash diff --git a/.github/workflows/CI_faiss_milvus2x_main.yaml b/.github/workflows/CI_faiss_milvus2x_main.yaml index 767a6c6..9ffcfa7 100644 --- a/.github/workflows/CI_faiss_milvus2x_main.yaml +++ b/.github/workflows/CI_faiss_milvus2x_main.yaml @@ -69,9 +69,9 @@ jobs: shell: bash working-directory: deployment/${{ matrix.milvus_2_x_mode }} run: | - docker-compose up -d + docker compose up -d bash ../../scripts/check_healthy.sh - docker-compose ps -a + docker compose ps -a - name: Prepare config shell: bash diff --git a/.github/workflows/CI_milvus1x_milvus2x_main.yaml b/.github/workflows/CI_milvus1x_milvus2x_main.yaml index 6cda627..3db0428 100644 --- a/.github/workflows/CI_milvus1x_milvus2x_main.yaml +++ b/.github/workflows/CI_milvus1x_milvus2x_main.yaml @@ -69,9 +69,9 @@ jobs: shell: bash working-directory: deployment/${{ matrix.milvus_2_x_mode }} run: | - docker-compose up -d + docker compose up -d bash ../../scripts/check_healthy.sh - docker-compose ps -a + docker compose ps -a - name: Prepare config shell: bash diff --git a/.github/workflows/CI_milvus1x_milvus2x_specify_config_main.yaml b/.github/workflows/CI_milvus1x_milvus2x_specify_config_main.yaml index 8a766ab..5ba0857 100644 --- a/.github/workflows/CI_milvus1x_milvus2x_specify_config_main.yaml +++ b/.github/workflows/CI_milvus1x_milvus2x_specify_config_main.yaml @@ -69,9 +69,9 @@ jobs: shell: bash working-directory: deployment/${{ matrix.milvus_2_x_mode }} run: | - docker-compose up -d + docker compose up -d bash ../../scripts/check_healthy.sh - docker-compose ps -a + docker compose ps -a - name: dump timeout-minutes: 3 diff --git a/scripts/check_healthy.sh b/scripts/check_healthy.sh index 9b293da..d866a18 100644 --- a/scripts/check_healthy.sh +++ b/scripts/check_healthy.sh @@ -4,8 +4,8 @@ function check_healthy { Expect=$(yq '.services | length' 'docker-compose.yml') Expect_health=$(yq '.services' 'docker-compose.yml' |grep 'healthcheck'|wc -l) - cnt=$(docker-compose ps | grep -E "running|Running|Up|up" | wc -l) - healthy=$(docker-compose ps | grep "healthy" | wc -l) + cnt=$(docker compose ps | grep -E "running|Running|Up|up" | wc -l) + healthy=$(docker compose ps | grep "healthy" | wc -l) time_cnt=0 echo "running num $cnt expect num $Expect" echo "healthy num $healthy expect num $Expect_health" @@ -20,8 +20,8 @@ function check_healthy { printf "timeout,there are some issues with deployment!" exit 1 fi - cnt=$(docker-compose ps | grep -E "running|Running|Up|up" | wc -l) - healthy=$(docker-compose ps | grep "healthy" | wc -l) + cnt=$(docker compose ps | grep -E "running|Running|Up|up" | wc -l) + healthy=$(docker compose ps | grep "healthy" | wc -l) echo "running num $cnt expect num $Expect" echo "healthy num $healthy expect num $Expect_health" done