yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: docker-compose to docker compose

This commit is contained in:
William Yang 2023-03-08 18:05:23 +01:00
parent ddd08b782f
commit 0983c2dd55
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/run_test_cases.yaml vendored
View File

@ -201,7 +201,7 @@ jobs:
if [[ ${{ matrix.app_name }} == *ldap ]]; then if [[ ${{ matrix.app_name }} == *ldap ]]; then
docker_compose_files="${docker_compose_files} -f .ci/docker-compose-file/docker-compose-ldap-tcp.yaml" docker_compose_files="${docker_compose_files} -f .ci/docker-compose-file/docker-compose-ldap-tcp.yaml"
fi fi
docker-compose $docker_compose_files up -d --build docker compose $docker_compose_files up -d --build
if [ -f EMQX_ENTERPRISE ]; then 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" 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 fi
@ -211,7 +211,7 @@ jobs:
docker ps -a --filter name=client docker ps -a --filter name=client
echo "waiting for docker ${client} to exit" echo "waiting for docker ${client} to exit"
if ! timeout 60 docker wait "${client}"; then 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 exit 1
fi fi
done done