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

chore(docker compose): update emqx cluster compose file

This commit is contained in:
zhanghongtong 2021-04-19 17:27:20 +08:00 committed by Rory Z
parent ad630f49ef
commit 48b0cc37ed
4 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.ci/docker-compose-file/conf.cluster.env Normal file
View File

@ -0,0 +1,6 @@
EMQX_NAME=emqx
EMQX_CLUSTER__DISCOVERY=static
EMQX_CLUSTER__STATIC__SEEDS="emqx@node1.emqx.io, emqx@node2.emqx.io"
EMQX_LISTENER__TCP__EXTERNAL__PROXY_PROTOCOL=on
EMQX_LISTENER__WS__EXTERNAL__PROXY_PROTOCOL=on
EMQX_LOG__LEVEL=debug

27
.ci/docker-compose-file/docker-compose-emqx-cluster.yaml
View File

@ -10,7 +10,8 @@ services:
volumes: volumes:
- ./haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg - ./haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg
- ../../etc/certs:/usr/local/etc/haproxy/certs - ../../etc/certs:/usr/local/etc/haproxy/certs
# ports: ports:
- "18083:18083"
# - "1883:1883" # - "1883:1883"
# - "8883:8883" # - "8883:8883"
# - "8083:8083" # - "8083:8083"
@ -28,16 +29,10 @@ services:
emqx1: emqx1:
container_name: node1.emqx.io container_name: node1.emqx.io
image: $TARGET:$EMQX_TAG image: $TARGET:$EMQX_TAG
env_file:
- conf.cluster.env
environment: environment:
- "EMQX_NAME=emqx" - "EMQX_HOST=node1.emqx.io"
- "EMQX_HOST=node1.emqx.io"
- "EMQX_CLUSTER__DISCOVERY=static"
- "EMQX_CLUSTER__STATIC__SEEDS=emqx@node1.emqx.io, emqx@node2.emqx.io"
- "EMQX_LISTENER__TCP__EXTERNAL__PROXY_PROTOCOL=on"
- "EMQX_LISTENER__WS__EXTERNAL__PROXY_PROTOCOL=on"
- "EMQX_ZONE__EXTERNAL__RETRY_INTERVAL=2s"
- "EMQX_MQTT__MAX_TOPIC_ALIAS=10"
- "EMQX_LOG__LEVEL=debug"
command: command:
- /bin/sh - /bin/sh
- -c - -c
@ -58,16 +53,10 @@ services:
emqx2: emqx2:
container_name: node2.emqx.io container_name: node2.emqx.io
image: $TARGET:$EMQX_TAG image: $TARGET:$EMQX_TAG
env_file:
- conf.cluster.env
environment: environment:
- "EMQX_NAME=emqx" - "EMQX_HOST=node2.emqx.io"
- "EMQX_HOST=node2.emqx.io"
- "EMQX_CLUSTER__DISCOVERY=static"
- "EMQX_CLUSTER__STATIC__SEEDS=emqx@node1.emqx.io, emqx@node2.emqx.io"
- "EMQX_LISTENER__TCP__EXTERNAL__PROXY_PROTOCOL=on"
- "EMQX_LISTENER__WS__EXTERNAL__PROXY_PROTOCOL=on"
- "EMQX_ZONE__EXTERNAL__RETRY_INTERVAL=2s"
- "EMQX_MQTT__MAX_TOPIC_ALIAS=10"
- "EMQX_LOG__LEVEL=debug"
command: command:
- /bin/sh - /bin/sh
- -c - -c

2
.ci/docker-compose-file/haproxy/haproxy.cfg
View File

@ -2,7 +2,7 @@
## global 2021/04/05 ## global 2021/04/05
##---------------------------------------------------------------- ##----------------------------------------------------------------
global global
log 127.0.0.1:514 local0 notice log stdout format raw daemon debug
# Replace 1024000 with deployment connections # Replace 1024000 with deployment connections
maxconn 1000 maxconn 1000
nbproc 1 nbproc 1

3
.github/workflows/run_fvt_tests.yaml vendored
View File

@ -35,6 +35,9 @@ jobs:
timeout-minutes: 5 timeout-minutes: 5
run: | run: |
set -e -u -x set -e -u -x
echo "CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_" >> .ci/docker-compose-file/conf.cluster.env
echo "EMQX_ZONE__EXTERNAL__RETRY_INTERVAL=2s" >> .ci/docker-compose-file/conf.cluster.env
echo "EMQX_MQTT__MAX_TOPIC_ALIAS=10" >> .ci/docker-compose-file/conf.cluster.env
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-python.yaml \ -f .ci/docker-compose-file/docker-compose-python.yaml \