ci: use latest version of docker compose
This commit is contained in:
parent
3a735d8f5d
commit
b03557082f
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue