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

Docker-compose: valkey images replacement for redis, redis-cluster, redis ssl

Browse Source
This commit is contained in:
Sergey Matvienko 2025-03-13 18:17:33 +01:00
parent 2867082776
commit 1352475301
3 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
docker/docker-compose.redis-cluster.yml
View File

@ -20,60 +20,55 @@ services:
# Redis cluster
# The latest version of Redis compatible with ThingsBoard is 7.2
redis-node-0:
image: bitnami/redis-cluster:7.2
image: bitnami/valkey-cluster:8.0
volumes:
- ./tb-node/redis-cluster-data-0:/bitnami/redis/data
environment:
- 'REDIS_PASSWORD=thingsboard'
- 'REDISCLI_AUTH=thingsboard'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
- 'VALKEY_PASSWORD=thingsboard'
- 'VALKEY_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
redis-node-1:
image: bitnami/redis-cluster:7.2
image: bitnami/valkey-cluster:8.0
volumes:
- ./tb-node/redis-cluster-data-1:/bitnami/redis/data
depends_on:
- redis-node-0
environment:
- 'REDIS_PASSWORD=thingsboard'
- 'REDISCLI_AUTH=thingsboard'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
- 'VALKEY_PASSWORD=thingsboard'
- 'VALKEY_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
redis-node-2:
image: bitnami/redis-cluster:7.2
image: bitnami/valkey-cluster:8.0
volumes:
- ./tb-node/redis-cluster-data-2:/bitnami/redis/data
depends_on:
- redis-node-1
environment:
- 'REDIS_PASSWORD=thingsboard'
- 'REDISCLI_AUTH=thingsboard'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
- 'VALKEY_PASSWORD=thingsboard'
- 'VALKEY_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
redis-node-3:
image: bitnami/redis-cluster:7.2
image: bitnami/valkey-cluster:8.0
volumes:
- ./tb-node/redis-cluster-data-3:/bitnami/redis/data
depends_on:
- redis-node-2
environment:
- 'REDIS_PASSWORD=thingsboard'
- 'REDISCLI_AUTH=thingsboard'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
- 'VALKEY_PASSWORD=thingsboard'
- 'VALKEY_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
redis-node-4:
image: bitnami/redis-cluster:7.2
image: bitnami/valkey-cluster:8.0
volumes:
- ./tb-node/redis-cluster-data-4:/bitnami/redis/data
depends_on:
- redis-node-3
environment:
- 'REDIS_PASSWORD=thingsboard'
- 'REDISCLI_AUTH=thingsboard'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
- 'VALKEY_PASSWORD=thingsboard'
- 'VALKEY_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
redis-node-5:
image: bitnami/redis-cluster:7.2
image: bitnami/valkey-cluster:8.0
volumes:
- ./tb-node/redis-cluster-data-5:/bitnami/redis/data
depends_on:
@ -83,11 +78,10 @@ services:
- redis-node-3
- redis-node-4
environment:
- 'REDIS_PASSWORD=thingsboard'
- 'REDISCLI_AUTH=thingsboard'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
- 'REDIS_CLUSTER_REPLICAS=1'
- 'REDIS_CLUSTER_CREATOR=yes'
- 'VALKEY_PASSWORD=thingsboard'
- 'VALKEY_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
- 'VALKEY_CLUSTER_REPLICAS=1'
- 'VALKEY_CLUSTER_CREATOR=yes'
# ThingsBoard setup to use redis-cluster
tb-core1:

2
docker/docker-compose.redis.yml
View File

@ -21,7 +21,7 @@ services:
# The latest version of Redis compatible with ThingsBoard is 7.2
redis:
restart: always
image: bitnami/redis:7.2
image: bitnami/valkey:8.0
environment:
# ALLOW_EMPTY_PASSWORD is recommended only for development.
ALLOW_EMPTY_PASSWORD: "yes"

12
msa/black-box-tests/src/test/resources/docker-compose.redis-ssl.yml
View File

@ -21,15 +21,15 @@ services:
# The latest version of Redis compatible with ThingsBoard is 7.2
redis:
restart: always
image: bitnami/redis:7.2
image: bitnami/valkey:8.0
environment:
# ALLOW_EMPTY_PASSWORD is recommended only for development.
- 'ALLOW_EMPTY_PASSWORD=yes'
- 'REDIS_TLS_ENABLED=yes'
- 'REDIS_TLS_CERT_FILE=/redis/certs/redis.crt'
- 'REDIS_TLS_KEY_FILE=/redis/certs/redis.key'
- 'REDIS_TLS_CA_FILE=/redis/certs/redisCA.crt'
- 'REDIS_TLS_AUTH_CLIENTS=no'
- 'VALKEY_TLS_ENABLED=yes'
- 'VALKEY_TLS_CERT_FILE=/redis/certs/redis.crt'
- 'VALKEY_TLS_KEY_FILE=/redis/certs/redis.key'
- 'VALKEY_TLS_CA_FILE=/redis/certs/redisCA.crt'
- 'VALKEY_TLS_AUTH_CLIENTS=no'
ports:
- '6379:6379'
volumes: