diff --git a/shotover-proxy/tests/test-configs/redis/cluster-auth/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/cluster-auth/docker-compose.yaml index 6dd955774..b491dd232 100644 --- a/shotover-proxy/tests/test-configs/redis/cluster-auth/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/cluster-auth/docker-compose.yaml @@ -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' diff --git a/shotover-proxy/tests/test-configs/redis/cluster-dr/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/cluster-dr/docker-compose.yaml index 6965fca35..7cf79432b 100644 --- a/shotover-proxy/tests/test-configs/redis/cluster-dr/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/cluster-dr/docker-compose.yaml @@ -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' diff --git a/shotover-proxy/tests/test-configs/redis/cluster-handling/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/cluster-handling/docker-compose.yaml index 373102694..f766abdce 100644 --- a/shotover-proxy/tests/test-configs/redis/cluster-handling/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/cluster-handling/docker-compose.yaml @@ -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' diff --git a/shotover-proxy/tests/test-configs/redis/cluster-hiding/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/cluster-hiding/docker-compose.yaml index 373102694..f766abdce 100644 --- a/shotover-proxy/tests/test-configs/redis/cluster-hiding/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/cluster-hiding/docker-compose.yaml @@ -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' diff --git a/shotover-proxy/tests/test-configs/redis/cluster-ports-rewrite/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/cluster-ports-rewrite/docker-compose.yaml index 5f1d9dbd4..76993eb0c 100644 --- a/shotover-proxy/tests/test-configs/redis/cluster-ports-rewrite/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/cluster-ports-rewrite/docker-compose.yaml @@ -1,53 +1,53 @@ 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: &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: image: *image ports: - "2221:6379" environment: *environment - redis-node-2: + valkey-node-2: image: *image ports: - "2222:6379" environment: *environment - redis-node-3: + valkey-node-3: image: *image ports: - "2223:6379" environment: *environment - redis-node-4: + valkey-node-4: image: *image ports: - "2224:6379" environment: *environment - redis-node-5: + valkey-node-5: image: *image ports: - "2225: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: - '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' diff --git a/shotover-proxy/tests/test-configs/redis/cluster-tls/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/cluster-tls/docker-compose.yaml index 34de9e2a7..0e9f75ecb 100644 --- a/shotover-proxy/tests/test-configs/redis/cluster-tls/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/cluster-tls/docker-compose.yaml @@ -9,25 +9,25 @@ networks: 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 volumes: - &keys ../tls/certs:/usr/local/etc/redis/certs environment: &node_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' - - 'REDIS_TLS_PORT=6379' - - 'REDIS_TLS_ENABLED=true' - - 'REDIS_TLS_CERT_FILE=/usr/local/etc/redis/certs/localhost.crt' - - 'REDIS_TLS_KEY_FILE=/usr/local/etc/redis/certs/localhost.key' - - 'REDIS_TLS_CA_FILE=/usr/local/etc/redis/certs/localhost_CA.crt' - - 'REDIS_TLS_AUTH_CLIENTS=yes' + - 'VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5' + - 'VALKEY_TLS_PORT=6379' + - 'VALKEY_TLS_ENABLED=true' + - 'VALKEY_TLS_CERT_FILE=/usr/local/etc/redis/certs/localhost.crt' + - 'VALKEY_TLS_KEY_FILE=/usr/local/etc/redis/certs/localhost.key' + - 'VALKEY_TLS_CA_FILE=/usr/local/etc/redis/certs/localhost_CA.crt' + - 'VALKEY_TLS_AUTH_CLIENTS=yes' - redis-node-1: + valkey-node-1: networks: cluster_subnet: ipv4_address: 172.16.1.3 @@ -36,7 +36,7 @@ services: - *keys environment: *node_environment - redis-node-2: + valkey-node-2: networks: cluster_subnet: ipv4_address: 172.16.1.4 @@ -45,7 +45,7 @@ services: - *keys environment: *node_environment - redis-node-3: + valkey-node-3: networks: cluster_subnet: ipv4_address: 172.16.1.5 @@ -54,7 +54,7 @@ services: - *keys environment: *node_environment - redis-node-4: + valkey-node-4: networks: cluster_subnet: ipv4_address: 172.16.1.6 @@ -63,7 +63,7 @@ services: - *keys environment: *node_environment - redis-node-5: + valkey-node-5: networks: cluster_subnet: ipv4_address: 172.16.1.7 @@ -72,27 +72,27 @@ services: - *keys environment: *node_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 volumes: - *keys environment: - - 'REDIS_CLUSTER_REPLICAS=1' - - 'REDIS_CLUSTER_CREATOR=yes' + - 'VALKEY_CLUSTER_REPLICAS=1' + - 'VALKEY_CLUSTER_CREATOR=yes' - 'ALLOW_EMPTY_PASSWORD=yes' - - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5' - - 'REDIS_TLS_PORT=6379' - - 'REDIS_TLS_ENABLED=true' - - 'REDIS_TLS_CERT_FILE=/usr/local/etc/redis/certs/localhost.crt' - - 'REDIS_TLS_KEY_FILE=/usr/local/etc/redis/certs/localhost.key' - - 'REDIS_TLS_CA_FILE=/usr/local/etc/redis/certs/localhost_CA.crt' + - 'VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5' + - 'VALKEY_TLS_PORT=6379' + - 'VALKEY_TLS_ENABLED=true' + - 'VALKEY_TLS_CERT_FILE=/usr/local/etc/redis/certs/localhost.crt' + - 'VALKEY_TLS_KEY_FILE=/usr/local/etc/redis/certs/localhost.key' + - 'VALKEY_TLS_CA_FILE=/usr/local/etc/redis/certs/localhost_CA.crt' diff --git a/shotover-proxy/tests/test-configs/redis/tls-no-client-auth/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/tls-no-client-auth/docker-compose.yaml index c2c767506..4dd4cae98 100644 --- a/shotover-proxy/tests/test-configs/redis/tls-no-client-auth/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/tls-no-client-auth/docker-compose.yaml @@ -1,14 +1,14 @@ services: - redis-one: - image: bitnami/redis:6.2.13-debian-11-r73 + valkey-one: + image: bitnami/valkey:7.2.5-debian-12-r9 ports: - "1111:6379" volumes: - ../tls/certs:/certs environment: ALLOW_EMPTY_PASSWORD: "yes" - REDIS_TLS_ENABLED: "yes" - REDIS_TLS_CERT_FILE: "/certs/localhost.crt" - REDIS_TLS_KEY_FILE: "/certs/localhost.key" - REDIS_TLS_CA_FILE: "/certs/localhost_CA.crt" - REDIS_TLS_AUTH_CLIENTS: "no" + VALKEY_TLS_ENABLED: "yes" + VALKEY_TLS_CERT_FILE: "/certs/localhost.crt" + VALKEY_TLS_KEY_FILE: "/certs/localhost.key" + VALKEY_TLS_CA_FILE: "/certs/localhost_CA.crt" + VALKEY_TLS_AUTH_CLIENTS: "no" diff --git a/shotover-proxy/tests/test-configs/redis/tls-no-verify-hostname/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/tls-no-verify-hostname/docker-compose.yaml index 9c46c43f3..74178b0c1 100644 --- a/shotover-proxy/tests/test-configs/redis/tls-no-verify-hostname/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/tls-no-verify-hostname/docker-compose.yaml @@ -1,14 +1,14 @@ services: - redis-one: - image: bitnami/redis:6.2.13-debian-11-r73 + valkey-one: + image: bitnami/valkey:7.2.5-debian-12-r9 ports: - "1111:6379" volumes: - ../tls/certs:/certs environment: ALLOW_EMPTY_PASSWORD: "yes" - REDIS_TLS_ENABLED: "yes" - REDIS_TLS_CERT_FILE: "/certs/localhost.crt" - REDIS_TLS_KEY_FILE: "/certs/localhost.key" - REDIS_TLS_CA_FILE: "/certs/localhost_CA.crt" - REDIS_TLS_AUTH_CLIENTS: "yes" + VALKEY_TLS_ENABLED: "yes" + VALKEY_TLS_CERT_FILE: "/certs/localhost.crt" + VALKEY_TLS_KEY_FILE: "/certs/localhost.key" + VALKEY_TLS_CA_FILE: "/certs/localhost_CA.crt" + VALKEY_TLS_AUTH_CLIENTS: "yes" diff --git a/shotover-proxy/tests/test-configs/redis/tls/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/tls/docker-compose.yaml index 5fd3735d1..8ab61e463 100644 --- a/shotover-proxy/tests/test-configs/redis/tls/docker-compose.yaml +++ b/shotover-proxy/tests/test-configs/redis/tls/docker-compose.yaml @@ -1,14 +1,14 @@ services: - redis-one: - image: bitnami/redis:6.2.13-debian-11-r73 + valkey-one: + image: bitnami/valkey:7.2.5-debian-12-r9 ports: - "1111:6379" volumes: - ./certs:/certs environment: ALLOW_EMPTY_PASSWORD: "yes" - REDIS_TLS_ENABLED: "yes" - REDIS_TLS_CERT_FILE: "/certs/localhost.crt" - REDIS_TLS_KEY_FILE: "/certs/localhost.key" - REDIS_TLS_CA_FILE: "/certs/localhost_CA.crt" - REDIS_TLS_AUTH_CLIENTS: "yes" + VALKEY_TLS_ENABLED: "yes" + VALKEY_TLS_CERT_FILE: "/certs/localhost.crt" + VALKEY_TLS_KEY_FILE: "/certs/localhost.key" + VALKEY_TLS_CA_FILE: "/certs/localhost_CA.crt" + VALKEY_TLS_AUTH_CLIENTS: "yes" diff --git a/test-helpers/src/docker_compose.rs b/test-helpers/src/docker_compose.rs index 06b2fb802..e8c2e9378 100644 --- a/test-helpers/src/docker_compose.rs +++ b/test-helpers/src/docker_compose.rs @@ -32,17 +32,19 @@ pub static IMAGE_WAITERS: [Image; 11] = [ timeout: Duration::from_secs(120), }, Image { - name: "library/redis:6.2.5", - log_regex_to_wait_for: r"Ready to accept connections", + name: "bitnami/redis-cluster:6.2.12-debian-11-r26", + //`Cluster state changed` is created by the node services + //`Cluster correctly created` is created by the init service + log_regex_to_wait_for: r"Cluster state changed|Cluster correctly created", timeout: Duration::from_secs(120), }, Image { - name: "bitnami/redis:6.2.13-debian-11-r73", + name: "bitnami/valkey:7.2.5-debian-12-r9", log_regex_to_wait_for: r"Ready to accept connections", timeout: Duration::from_secs(120), }, Image { - name: "bitnami/redis-cluster:6.2.12-debian-11-r26", + name: "bitnami/valkey-cluster:7.2.5-debian-12-r4", //`Cluster state changed` is created by the node services //`Cluster correctly created` is created by the init service log_regex_to_wait_for: r"Cluster state changed|Cluster correctly created",