From b03557082fea269f3606ec5d78bab9d2270b7d2e Mon Sep 17 00:00:00 2001
From: Ivan Dyachkov <dev@dyachkov.org>
Date: Tue, 28 Feb 2023 13:28:27 +0100
Subject: [PATCH] ci: use latest version of docker compose

---
 .github/workflows/run_automate_tests.yaml |  8 ++++----
 .github/workflows/run_cts_tests.yaml      | 18 +++++++++---------
 .github/workflows/run_test_cases.yaml     |  4 ++--
 deploy/docker/README.md                   |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/run_automate_tests.yaml b/.github/workflows/run_automate_tests.yaml
index 6168089f9..8b6e33223 100644
--- a/.github/workflows/run_automate_tests.yaml
+++ b/.github/workflows/run_automate_tests.yaml
@@ -79,7 +79,7 @@ jobs:
         TARGET: emqx/${{ needs.build.outputs.imgname }}
         EMQX_TAG: ${{ needs.build.outputs.version }}
       run: |
-        docker-compose \
+        docker compose \
           -f .ci/docker-compose-file/docker-compose-emqx-cluster.yaml \
           up -d --build
     - uses: actions/checkout@v3
@@ -180,7 +180,7 @@ jobs:
         EMQX_TAG: ${{ needs.build.outputs.version }}
         MYSQL_TAG: ${{ matrix.mysql_tag }}
       run: |
-        docker-compose \
+        docker compose \
           -f .ci/docker-compose-file/docker-compose-emqx-cluster.yaml \
           -f .ci/docker-compose-file/docker-compose-mysql-tls.yaml \
           up -d --build
@@ -287,7 +287,7 @@ jobs:
         EMQX_TAG: ${{ needs.build.outputs.version }}
         PGSQL_TAG: ${{ matrix.pgsql_tag }}
       run: |
-        docker-compose \
+        docker compose \
           -f .ci/docker-compose-file/docker-compose-emqx-broker-cluster.yaml \
           -f .ci/docker-compose-file/docker-compose-pgsql-tls.yaml \
           up -d --build
@@ -383,7 +383,7 @@ jobs:
         EMQX_TAG: ${{ needs.build.outputs.version }}
         MYSQL_TAG: 8
       run: |
-        docker-compose \
+        docker compose \
           -f .ci/docker-compose-file/docker-compose-emqx-broker-cluster.yaml \
           -f .ci/docker-compose-file/docker-compose-mysql-tcp.yaml \
           -f .ci/docker-compose-file/docker-compose-enterprise-tomcat-tcp.yaml \
diff --git a/.github/workflows/run_cts_tests.yaml b/.github/workflows/run_cts_tests.yaml
index cd204c37e..ed5ab7603 100644
--- a/.github/workflows/run_cts_tests.yaml
+++ b/.github/workflows/run_cts_tests.yaml
@@ -33,7 +33,7 @@ jobs:
         env:
           LDAP_TAG: ${{ matrix.ldap_tag }}
         run: |
-          docker-compose \
+          docker compose \
             -f .ci/docker-compose-file/docker-compose-ldap-tcp.yaml \
             -f .ci/docker-compose-file/docker-compose.yaml \
             up -d --build
@@ -88,9 +88,9 @@ jobs:
         run: |
           docker rm -f $(docker ps -qa) || true
           docker network rm $(docker network ls -q) || true
-      - name: docker-compose up
+      - name: docker compose up
         run: |
-          docker-compose \
+          docker compose \
             -f .ci/docker-compose-file/docker-compose-toxiproxy.yaml \
             -f .ci/docker-compose-file/docker-compose-mongo-${{ matrix.connect_type }}.yaml \
             -f .ci/docker-compose-file/docker-compose.yaml \
@@ -164,10 +164,10 @@ jobs:
         run: |
           docker rm -f $(docker ps -qa) || true
           docker network rm $(docker network ls -q) || true
-      - name: docker-compose up
+      - name: docker compose up
         timeout-minutes: 5
         run: |
-          docker-compose \
+          docker compose \
             -f .ci/docker-compose-file/docker-compose-mysql-${{ matrix.connect_type }}.yaml \
             -f .ci/docker-compose-file/docker-compose.yaml \
             up -d --build
@@ -254,9 +254,9 @@ jobs:
         run: |
           docker rm -f $(docker ps -qa) || true
           docker network rm $(docker network ls -q) || true
-      - name: docker-compose up
+      - name: docker compose up
         run: |
-          docker-compose \
+          docker compose \
             -f .ci/docker-compose-file/docker-compose-pgsql-${{ matrix.connect_type }}.yaml \
             -f .ci/docker-compose-file/docker-compose.yaml \
             up -d --build
@@ -339,9 +339,9 @@ jobs:
         run: |
           docker rm -f $(docker ps -qa) || true
           docker network rm $(docker network ls -q) || true
-      - name: docker-compose up
+      - name: docker compose up
         run: |
-          docker-compose \
+          docker compose \
             -f .ci/docker-compose-file/docker-compose-redis-${{ matrix.node_type }}-${{ matrix.connect_type }}.yaml \
             -f .ci/docker-compose-file/docker-compose.yaml \
             up -d --build
diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml
index 38cd2f9bb..9a0ea738d 100644
--- a/.github/workflows/run_test_cases.yaml
+++ b/.github/workflows/run_test_cases.yaml
@@ -201,7 +201,7 @@ jobs:
           if [[ ${{ matrix.app_name }} == *ldap ]]; then
             docker_compose_files="${docker_compose_files} -f .ci/docker-compose-file/docker-compose-ldap-tcp.yaml"
           fi
-          docker-compose $docker_compose_files up -d --build
+          docker compose $docker_compose_files up -d --build
           if [ -f EMQX_ENTERPRISE ]; then
             docker exec -i erlang bash -c "echo \"https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com\" > /root/.git-credentials && git config --global credential.helper store"
           fi
@@ -211,7 +211,7 @@ jobs:
             docker ps -a --filter name=client
             echo "waiting for docker ${client} to exit"
             if ! timeout 60 docker wait "${client}"; then
-              docker-compose $docker_compose_files logs | tee docker-compose.log
+              docker compose $docker_compose_files logs | tee docker-compose.log
               exit 1
             fi
           done
diff --git a/deploy/docker/README.md b/deploy/docker/README.md
index 35eb68e82..85e7715ad 100644
--- a/deploy/docker/README.md
+++ b/deploy/docker/README.md
@@ -243,7 +243,7 @@ Let's create a static node list cluster from docker-compose.
 + Start the docker-compose cluster
 
   ```bash
-  docker-compose -p my_emqx up -d
+  docker compose -p my_emqx up -d
   ```
 
 + View cluster