Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ins 33065 update docker compose for valkey #1809

Merged
merged 12 commits into from
Nov 13, 2024
+169 −167
Merged

Ins 33065 update docker compose for valkey #1809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
635b949
Update cluster-auth
ronycsdu Nov 12, 2024
7855960
Merge branch 'main' into INS-33065-update-docker-compose-for-valkey
ronycsdu Nov 12, 2024
c71d8a8
Update cluster-dr
ronycsdu Nov 12, 2024
21bea93
Update cluster-handling
ronycsdu Nov 12, 2024
c910c90
Update cluster-hiding
ronycsdu Nov 12, 2024
6f118cb
Update cluster-ports-rewrite
ronycsdu Nov 12, 2024
ec4c838
Update cluster tls related files
ronycsdu Nov 13, 2024
a6a0648
Update format
ronycsdu Nov 13, 2024
2b379ce
Merge branch 'main' into INS-33065-update-docker-compose-for-valkey
ronycsdu Nov 13, 2024
a8c57d6
Update valkey:7.2.5 to valkey:7.2.5-debian-12-r9 and valkey-cluster:7…
ronycsdu Nov 13, 2024
9280507
Merge branch 'INS-33065-update-docker-compose-for-valkey' of https://…
ronycsdu Nov 13, 2024
83a76ca
Merge branch 'main' into INS-33065-update-docker-compose-for-valkey
rukai Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions shotover-proxy/tests/test-configs/redis/cluster-auth/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
services:
redis-node-0:
image: &image bitnami/redis-cluster:6.2.12-debian-11-r26
valkey-node-0:
image: &image bitnami/valkey-cluster:7.2.5-debian-12-r4
ports:
- "2230:6379"
environment: &environment
- 'REDIS_PASSWORD=shotover'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
- 'VALKEY_PASSWORD=shotover'
- 'VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5'

redis-node-1:
valkey-node-1:
image: *image
ports:
- "2231:6379"
environment: *environment

redis-node-2:
valkey-node-2:
image: *image
ports:
- "2232:6379"
environment: *environment

redis-node-3:
valkey-node-3:
image: *image
ports:
- "2233:6379"
environment: *environment

redis-node-4:
valkey-node-4:
image: *image
ports:
- "2234:6379"
environment: *environment

redis-node-5:
valkey-node-5:
image: *image
ports:
- "2235:6379"
environment: *environment

redis-cluster-init:
valkey-cluster-init:
image: *image
depends_on:
- redis-node-0
- redis-node-1
- redis-node-2
- redis-node-3
- redis-node-4
- redis-node-5
- valkey-node-0
- valkey-node-1
- valkey-node-2
- valkey-node-3
- valkey-node-4
- valkey-node-5
environment:
- 'REDIS_PASSWORD=shotover'
- 'VALKEY_PASSWORD=shotover'
- 'REDISCLI_AUTH=shotover'
- 'REDIS_CLUSTER_REPLICAS=1'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
- 'REDIS_CLUSTER_CREATOR=yes'
- 'VALKEY_CLUSTER_REPLICAS=1'
- 'VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5'
- 'VALKEY_CLUSTER_CREATOR=yes'
78 changes: 39 additions & 39 deletions shotover-proxy/tests/test-configs/redis/cluster-dr/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,108 +1,108 @@
services:
redis-node-0:
image: &image bitnami/redis-cluster:6.2.12-debian-11-r26
valkey-node-0:
image: &image bitnami/valkey-cluster:7.2.5-debian-12-r4
ports:
- "2220:6379"
environment: &node-environment
- 'REDIS_PASSWORD=shotover'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
- 'VALKEY_PASSWORD=shotover'
- 'VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5'

redis-node-1:
valkey-node-1:
image: *image
ports:
- "2221:6379"
environment: *node-environment

redis-node-2:
valkey-node-2:
image: *image
ports:
- "2222:6379"
environment: *node-environment

redis-node-3:
valkey-node-3:
image: *image
ports:
- "2223:6379"
environment: *node-environment

redis-node-4:
valkey-node-4:
image: *image
ports:
- "2224:6379"
environment: *node-environment

redis-node-5:
valkey-node-5:
image: *image
ports:
- "2225:6379"
environment: *node-environment

redis-cluster-init:
valkey-cluster-init:
image: *image
depends_on:
- redis-node-0
- redis-node-1
- redis-node-2
- redis-node-3
- redis-node-4
- redis-node-5
- valkey-node-0
- valkey-node-1
- valkey-node-2
- valkey-node-3
- valkey-node-4
- valkey-node-5
environment:
- 'REDIS_PASSWORD=shotover'
- 'VALKEY_PASSWORD=shotover'
- 'REDISCLI_AUTH=shotover'
- 'REDIS_CLUSTER_REPLICAS=1'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
- 'REDIS_CLUSTER_CREATOR=yes'
- 'VALKEY_CLUSTER_REPLICAS=1'
- 'VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5'
- 'VALKEY_CLUSTER_CREATOR=yes'

redis-node-0-dr:
valkey-node-0-dr:
image: *image
ports:
- "2120:6379"
environment: &dr-environment
- 'REDIS_PASSWORD=shotover'
- 'REDIS_NODES=redis-node-0-dr redis-node-1-dr redis-node-2-dr redis-node-3-dr redis-node-4-dr redis-node-5-dr'
- 'VALKEY_PASSWORD=shotover'
- 'VALKEY_NODES=valkey-node-0-dr valkey-node-1-dr valkey-node-2-dr valkey-node-3-dr valkey-node-4-dr valkey-node-5-dr'

redis-node-1-dr:
valkey-node-1-dr:
image: *image
ports:
- "2121:6379"
environment: *dr-environment

redis-node-2-dr:
valkey-node-2-dr:
image: *image
ports:
- "2122:6379"
environment: *dr-environment

redis-node-3-dr:
valkey-node-3-dr:
image: *image
ports:
- "2123:6379"
environment: *dr-environment

redis-node-4-dr:
valkey-node-4-dr:
image: *image
ports:
- "2124:6379"
environment: *dr-environment

redis-node-5-dr:
valkey-node-5-dr:
image: *image
ports:
- "2125:6379"
environment: *dr-environment

redis-cluster-init-dr:
valkey-cluster-init-dr:
image: *image
depends_on:
- redis-node-0-dr
- redis-node-1-dr
- redis-node-2-dr
- redis-node-3-dr
- redis-node-4-dr
- redis-node-5-dr
- valkey-node-0-dr
- valkey-node-1-dr
- valkey-node-2-dr
- valkey-node-3-dr
- valkey-node-4-dr
- valkey-node-5-dr
environment:
- 'REDIS_PASSWORD=shotover'
- 'VALKEY_PASSWORD=shotover'
- 'REDISCLI_AUTH=shotover'
- 'REDIS_CLUSTER_REPLICAS=1'
- 'REDIS_NODES=redis-node-0-dr redis-node-1-dr redis-node-2-dr redis-node-3-dr redis-node-4-dr redis-node-5-dr'
- 'REDIS_CLUSTER_CREATOR=yes'
- 'VALKEY_CLUSTER_REPLICAS=1'
- 'VALKEY_NODES=valkey-node-0-dr valkey-node-1-dr valkey-node-2-dr valkey-node-3-dr valkey-node-4-dr valkey-node-5-dr'
- 'VALKEY_CLUSTER_CREATOR=yes'
36 changes: 18 additions & 18 deletions shotover-proxy/tests/test-configs/redis/cluster-handling/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,64 +8,64 @@ networks:
- subnet: 172.16.1.0/24
gateway: 172.16.1.1
services:
redis-node-0:
valkey-node-0:
networks:
cluster_subnet:
ipv4_address: 172.16.1.2
image: &image bitnami/redis-cluster:6.2.12-debian-11-r26
image: &image bitnami/valkey-cluster:7.2.5-debian-12-r4
environment: &environment
- 'ALLOW_EMPTY_PASSWORD=yes'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
- 'VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5'

redis-node-1:
valkey-node-1:
networks:
cluster_subnet:
ipv4_address: 172.16.1.3
image: *image
environment: *environment

redis-node-2:
valkey-node-2:
networks:
cluster_subnet:
ipv4_address: 172.16.1.4
image: *image
environment: *environment

redis-node-3:
valkey-node-3:
networks:
cluster_subnet:
ipv4_address: 172.16.1.5
image: *image
environment: *environment

redis-node-4:
valkey-node-4:
networks:
cluster_subnet:
ipv4_address: 172.16.1.6
image: *image
environment: *environment

redis-node-5:
valkey-node-5:
networks:
cluster_subnet:
ipv4_address: 172.16.1.7
image: *image
environment: *environment

redis-cluster-init:
valkey-cluster-init:
networks:
cluster_subnet:
ipv4_address: 172.16.1.8
image: *image
depends_on:
- redis-node-0
- redis-node-1
- redis-node-2
- redis-node-3
- redis-node-4
- redis-node-5
- valkey-node-0
- valkey-node-1
- valkey-node-2
- valkey-node-3
- valkey-node-4
- valkey-node-5
environment:
- 'ALLOW_EMPTY_PASSWORD=yes'
- 'REDIS_CLUSTER_REPLICAS=1'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
- 'REDIS_CLUSTER_CREATOR=yes'
- 'VALKEY_CLUSTER_REPLICAS=1'
- 'VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5'
- 'VALKEY_CLUSTER_CREATOR=yes'
36 changes: 18 additions & 18 deletions shotover-proxy/tests/test-configs/redis/cluster-hiding/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,64 +8,64 @@ networks:
- subnet: 172.16.1.0/24
gateway: 172.16.1.1
services:
redis-node-0:
valkey-node-0:
networks:
cluster_subnet:
ipv4_address: 172.16.1.2
image: &image bitnami/redis-cluster:6.2.12-debian-11-r26
image: &image bitnami/valkey-cluster:7.2.5-debian-12-r4
environment: &environment
- 'ALLOW_EMPTY_PASSWORD=yes'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
- 'VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5'

redis-node-1:
valkey-node-1:
networks:
cluster_subnet:
ipv4_address: 172.16.1.3
image: *image
environment: *environment

redis-node-2:
valkey-node-2:
networks:
cluster_subnet:
ipv4_address: 172.16.1.4
image: *image
environment: *environment

redis-node-3:
valkey-node-3:
networks:
cluster_subnet:
ipv4_address: 172.16.1.5
image: *image
environment: *environment

redis-node-4:
valkey-node-4:
networks:
cluster_subnet:
ipv4_address: 172.16.1.6
image: *image
environment: *environment

redis-node-5:
valkey-node-5:
networks:
cluster_subnet:
ipv4_address: 172.16.1.7
image: *image
environment: *environment

redis-cluster-init:
valkey-cluster-init:
networks:
cluster_subnet:
ipv4_address: 172.16.1.8
image: *image
depends_on:
- redis-node-0
- redis-node-1
- redis-node-2
- redis-node-3
- redis-node-4
- redis-node-5
- valkey-node-0
- valkey-node-1
- valkey-node-2
- valkey-node-3
- valkey-node-4
- valkey-node-5
environment:
- 'ALLOW_EMPTY_PASSWORD=yes'
- 'REDIS_CLUSTER_REPLICAS=1'
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
- 'REDIS_CLUSTER_CREATOR=yes'
- 'VALKEY_CLUSTER_REPLICAS=1'
- 'VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5'
- 'VALKEY_CLUSTER_CREATOR=yes'
Loading
Loading