Skip to content

Commit 7516993

Browse files
committed
Migrate to client-testing image
- Use clients-testing image for standalone and cluster - Remove hardcoded TLS certificates and keys - Remove stunnel - Remove Cluster docker and configs
1 parent 17db62e commit 7516993

22 files changed

+107
-371
lines changed

docker-compose.yml

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
---
22

3-
version: "3.8"
4-
53
services:
64

75
redis:
8-
image: ${REDIS_IMAGE:-redis:latest}
6+
image: redislabs/client-libs-test:8.0-M01
97
container_name: redis-standalone
10-
command: redis-server --enable-debug-command yes --protected-mode no
8+
environment:
9+
- REDIS_TLS_ENABLED=yes
10+
- PORT=6379
11+
- TLS_PORT=6666
12+
- REDIS_DIRECTIVES=--enable-debug-command yes
1113
ports:
1214
- 6379:6379
15+
- 6666:6666 # TLS port
16+
volumes:
17+
- "./dockers/standalone:/redis/work"
1318
profiles:
1419
- standalone
1520
- sentinel
@@ -29,39 +34,24 @@ services:
2934
- all
3035

3136
cluster:
37+
image: redislabs/client-libs-test:8.0-M01
3238
container_name: redis-cluster
33-
build:
34-
context: .
35-
dockerfile: dockers/Dockerfile.cluster
36-
args:
37-
REDIS_IMAGE: ${REDIS_IMAGE:-redis:latest}
39+
environment:
40+
- REDIS_CLUSTER=yes
41+
- NODES=6
42+
- TLS_ENABLED=yes
43+
- PORT=16379
44+
- TLS_PORT=17379
45+
- REDIS_DIRECTIVES=--tls-auth-clients optional
3846
ports:
39-
- 16379:16379
40-
- 16380:16380
41-
- 16381:16381
42-
- 16382:16382
43-
- 16383:16383
44-
- 16384:16384
47+
- "16379-16384:16379-16384"
48+
- "17379-17384:17379-17384"
4549
volumes:
46-
- "./dockers/cluster.redis.conf:/redis.conf:ro"
50+
- "./dockers/cluster:/redis/work"
4751
profiles:
4852
- cluster
4953
- all
5054

51-
stunnel:
52-
image: redisfab/stunnel:latest
53-
depends_on:
54-
- redis
55-
ports:
56-
- 6666:6666
57-
profiles:
58-
- all
59-
- standalone
60-
- ssl
61-
volumes:
62-
- "./dockers/stunnel/conf:/etc/stunnel/conf.d:ro"
63-
- "./dockers/stunnel/keys:/etc/stunnel/keys:ro"
64-
6555
sentinel:
6656
image: ${REDIS_IMAGE:-redis:latest}
6757
container_name: redis-sentinel

dockers/Dockerfile.cluster

Lines changed: 0 additions & 7 deletions
This file was deleted.

dockers/cluster.redis.conf

Lines changed: 0 additions & 2 deletions
This file was deleted.

dockers/create_cluster.sh

Lines changed: 0 additions & 47 deletions
This file was deleted.

dockers/stunnel/README

Lines changed: 0 additions & 1 deletion
This file was deleted.

dockers/stunnel/conf/redis.conf

Lines changed: 0 additions & 6 deletions
This file was deleted.

dockers/stunnel/create_certs.sh

Lines changed: 0 additions & 45 deletions
This file was deleted.

dockers/stunnel/keys/ca-cert.pem

Lines changed: 0 additions & 19 deletions
This file was deleted.

dockers/stunnel/keys/ca-key.pem

Lines changed: 0 additions & 28 deletions
This file was deleted.

dockers/stunnel/keys/client-cert.pem

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)