dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable edge configuration for docker compose

Browse Source
This commit is contained in:
Igor Kulikov 2021-04-12 12:31:16 +03:00
parent e0f978992e
commit 0d733455c1
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/docker-compose.yml
View File

@ -42,6 +42,7 @@ services:
image: "${DOCKER_REPO}/${TB_NODE_DOCKER_NAME}:${TB_VERSION}" image: "${DOCKER_REPO}/${TB_NODE_DOCKER_NAME}:${TB_VERSION}"
ports: ports:
- "8080" - "8080"
- "7070"
logging: logging:
driver: "json-file" driver: "json-file"
options: options:
@ -50,6 +51,7 @@ services:
environment: environment:
TB_SERVICE_ID: tb-core1 TB_SERVICE_ID: tb-core1
TB_SERVICE_TYPE: tb-core TB_SERVICE_TYPE: tb-core
EDGES_ENABLED: "true"
env_file: env_file:
- tb-node.env - tb-node.env
volumes: volumes:
@ -66,6 +68,7 @@ services:
image: "${DOCKER_REPO}/${TB_NODE_DOCKER_NAME}:${TB_VERSION}" image: "${DOCKER_REPO}/${TB_NODE_DOCKER_NAME}:${TB_VERSION}"
ports: ports:
- "8080" - "8080"
- "7070"
logging: logging:
driver: "json-file" driver: "json-file"
options: options:
@ -74,6 +77,7 @@ services:
environment: environment:
TB_SERVICE_ID: tb-core2 TB_SERVICE_ID: tb-core2
TB_SERVICE_TYPE: tb-core TB_SERVICE_TYPE: tb-core
EDGES_ENABLED: "true"
env_file: env_file:
- tb-node.env - tb-node.env
volumes: volumes:
@ -239,6 +243,7 @@ services:
- "80:80" - "80:80"
- "443:443" - "443:443"
- "1883:1883" - "1883:1883"
- "7070:7070"
- "9999:9999" - "9999:9999"
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
@ -246,6 +251,7 @@ services:
HTTP_PORT: 80 HTTP_PORT: 80
HTTPS_PORT: 443 HTTPS_PORT: 443
MQTT_PORT: 1883 MQTT_PORT: 1883
EDGES_RPC_PORT: 7070
FORCE_HTTPS_REDIRECT: "false" FORCE_HTTPS_REDIRECT: "false"
links: links:
- tb-core1 - tb-core1

11
docker/haproxy/config/haproxy.cfg
View File

@ -49,6 +49,17 @@ listen mqtt-in
server tbMqtt1 tb-mqtt-transport1:1883 check inter 5s resolvers docker_resolver resolve-prefer ipv4 server tbMqtt1 tb-mqtt-transport1:1883 check inter 5s resolvers docker_resolver resolve-prefer ipv4
server tbMqtt2 tb-mqtt-transport2:1883 check inter 5s resolvers docker_resolver resolve-prefer ipv4 server tbMqtt2 tb-mqtt-transport2:1883 check inter 5s resolvers docker_resolver resolve-prefer ipv4
listen edges-rpc-in
bind *:${EDGES_RPC_PORT}
mode tcp
option clitcpka # For TCP keep-alive
timeout client 3h
timeout server 3h
option tcplog
balance leastconn
server tbEdgesRpc1 tb-core1:7070 check inter 5s resolvers docker_resolver resolve-prefer ipv4
server tbEdgesRpc2 tb-core2:7070 check inter 5s resolvers docker_resolver resolve-prefer ipv4
frontend http-in frontend http-in
bind *:${HTTP_PORT} bind *:${HTTP_PORT}