Merge branch 'main' into feature_dbname

zilliztech · Aug 6, 2024 · 67312e1 · 67312e1
2 parents d2c829d + 8640c6b
commit 67312e1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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