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

ci: use latest version of docker compose

This commit is contained in:
Ivan Dyachkov 2023-02-28 13:28:27 +01:00
parent 3a735d8f5d
commit b03557082f
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/run_automate_tests.yaml vendored
View File

@ -79,7 +79,7 @@ jobs:
TARGET: emqx/${{ needs.build.outputs.imgname }} TARGET: emqx/${{ needs.build.outputs.imgname }}
EMQX_TAG: ${{ needs.build.outputs.version }} EMQX_TAG: ${{ needs.build.outputs.version }}
run: | run: |
docker-compose \ docker compose \
-f .ci/docker-compose-file/docker-compose-emqx-cluster.yaml \ -f .ci/docker-compose-file/docker-compose-emqx-cluster.yaml \
up -d --build up -d --build
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -180,7 +180,7 @@ jobs:
EMQX_TAG: ${{ needs.build.outputs.version }} EMQX_TAG: ${{ needs.build.outputs.version }}
MYSQL_TAG: ${{ matrix.mysql_tag }} MYSQL_TAG: ${{ matrix.mysql_tag }}
run: | run: |
docker-compose \ docker compose \
-f .ci/docker-compose-file/docker-compose-emqx-cluster.yaml \ -f .ci/docker-compose-file/docker-compose-emqx-cluster.yaml \
-f .ci/docker-compose-file/docker-compose-mysql-tls.yaml \ -f .ci/docker-compose-file/docker-compose-mysql-tls.yaml \
up -d --build up -d --build
@ -287,7 +287,7 @@ jobs:
EMQX_TAG: ${{ needs.build.outputs.version }} EMQX_TAG: ${{ needs.build.outputs.version }}
PGSQL_TAG: ${{ matrix.pgsql_tag }} PGSQL_TAG: ${{ matrix.pgsql_tag }}
run: | run: |
docker-compose \ docker compose \
-f .ci/docker-compose-file/docker-compose-emqx-broker-cluster.yaml \ -f .ci/docker-compose-file/docker-compose-emqx-broker-cluster.yaml \
-f .ci/docker-compose-file/docker-compose-pgsql-tls.yaml \ -f .ci/docker-compose-file/docker-compose-pgsql-tls.yaml \
up -d --build up -d --build
@ -383,7 +383,7 @@ jobs:
EMQX_TAG: ${{ needs.build.outputs.version }} EMQX_TAG: ${{ needs.build.outputs.version }}
MYSQL_TAG: 8 MYSQL_TAG: 8
run: | run: |
docker-compose \ docker compose \
-f .ci/docker-compose-file/docker-compose-emqx-broker-cluster.yaml \ -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-mysql-tcp.yaml \
-f .ci/docker-compose-file/docker-compose-enterprise-tomcat-tcp.yaml \ -f .ci/docker-compose-file/docker-compose-enterprise-tomcat-tcp.yaml \

18
.github/workflows/run_cts_tests.yaml vendored
View File

@ -33,7 +33,7 @@ jobs:
env: env:
LDAP_TAG: ${{ matrix.ldap_tag }} LDAP_TAG: ${{ matrix.ldap_tag }}
run: | run: |
docker-compose \ docker compose \
-f .ci/docker-compose-file/docker-compose-ldap-tcp.yaml \ -f .ci/docker-compose-file/docker-compose-ldap-tcp.yaml \
-f .ci/docker-compose-file/docker-compose.yaml \ -f .ci/docker-compose-file/docker-compose.yaml \
up -d --build up -d --build
@ -88,9 +88,9 @@ jobs:
run: | run: |
docker rm -f $(docker ps -qa) || true docker rm -f $(docker ps -qa) || true
docker network rm $(docker network ls -q) || true docker network rm $(docker network ls -q) || true
- name: docker-compose up - name: docker compose up
run: | run: |
docker-compose \ docker compose \
-f .ci/docker-compose-file/docker-compose-toxiproxy.yaml \ -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-mongo-${{ matrix.connect_type }}.yaml \
-f .ci/docker-compose-file/docker-compose.yaml \ -f .ci/docker-compose-file/docker-compose.yaml \
@ -164,10 +164,10 @@ jobs:
run: | run: |
docker rm -f $(docker ps -qa) || true docker rm -f $(docker ps -qa) || true
docker network rm $(docker network ls -q) || true docker network rm $(docker network ls -q) || true
- name: docker-compose up - name: docker compose up
timeout-minutes: 5 timeout-minutes: 5
run: | run: |
docker-compose \ docker compose \
-f .ci/docker-compose-file/docker-compose-mysql-${{ matrix.connect_type }}.yaml \ -f .ci/docker-compose-file/docker-compose-mysql-${{ matrix.connect_type }}.yaml \
-f .ci/docker-compose-file/docker-compose.yaml \ -f .ci/docker-compose-file/docker-compose.yaml \
up -d --build up -d --build
@ -254,9 +254,9 @@ jobs:
run: | run: |
docker rm -f $(docker ps -qa) || true docker rm -f $(docker ps -qa) || true
docker network rm $(docker network ls -q) || true docker network rm $(docker network ls -q) || true
- name: docker-compose up - name: docker compose up
run: | run: |
docker-compose \ docker compose \
-f .ci/docker-compose-file/docker-compose-pgsql-${{ matrix.connect_type }}.yaml \ -f .ci/docker-compose-file/docker-compose-pgsql-${{ matrix.connect_type }}.yaml \
-f .ci/docker-compose-file/docker-compose.yaml \ -f .ci/docker-compose-file/docker-compose.yaml \
up -d --build up -d --build
@ -339,9 +339,9 @@ jobs:
run: | run: |
docker rm -f $(docker ps -qa) || true docker rm -f $(docker ps -qa) || true
docker network rm $(docker network ls -q) || true docker network rm $(docker network ls -q) || true
- name: docker-compose up - name: docker compose up
run: | 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-redis-${{ matrix.node_type }}-${{ matrix.connect_type }}.yaml \
-f .ci/docker-compose-file/docker-compose.yaml \ -f .ci/docker-compose-file/docker-compose.yaml \
up -d --build up -d --build

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

2
deploy/docker/README.md
View File

@ -243,7 +243,7 @@ Let's create a static node list cluster from docker-compose.
+ Start the docker-compose cluster + Start the docker-compose cluster
```bash ```bash
docker-compose -p my_emqx up -d docker compose -p my_emqx up -d
``` ```
+ View cluster + View cluster