redis tls tests use bitnami image (#1355)

shotover · Oct 16, 2023 · 9a8d15b · 9a8d15b
1 parent c7baffa
commit 9a8d15b
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 31 deletions.
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
@@ -1,10 +1,15 @@
 version: "3.3"
 services:
  redis-one:
- image: library/redis:6.2.5
+ image: bitnami/redis:6.2.13-debian-11-r73
  ports:
  - "1111:6379"
  volumes:
- - ./redis.conf:/usr/local/etc/redis/redis.conf
- - ../tls/certs:/usr/local/etc/redis/certs
- command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
+ - ../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"
diff --git a/shotover-proxy/tests/test-configs/redis/tls-no-client-auth/redis.conf b/shotover-proxy/tests/test-configs/redis/tls-no-client-auth/redis.conf
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
@@ -1,10 +1,15 @@
 version: "3.3"
 services:
  redis-one:
- image: library/redis:6.2.5
+ image: bitnami/redis:6.2.13-debian-11-r73
  ports:
  - "1111:6379"
  volumes:
- - ./redis.conf:/usr/local/etc/redis/redis.conf
- - ../tls/certs:/usr/local/etc/redis/certs
- command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
+ - ../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"
diff --git a/shotover-proxy/tests/test-configs/redis/tls-no-verify-hostname/redis.conf b/shotover-proxy/tests/test-configs/redis/tls-no-verify-hostname/redis.conf
diff --git a/shotover-proxy/tests/test-configs/redis/tls/docker-compose.yaml b/shotover-proxy/tests/test-configs/redis/tls/docker-compose.yaml
@@ -1,10 +1,15 @@
 version: "3.3"
 services:
  redis-one:
- image: library/redis:6.2.5
+ image: bitnami/redis:6.2.13-debian-11-r73
  ports:
  - "1111:6379"
  volumes:
- - ./redis.conf:/usr/local/etc/redis/redis.conf
- - ./certs:/usr/local/etc/redis/certs
- command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
+ - ./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"
diff --git a/shotover-proxy/tests/test-configs/redis/tls/redis.conf b/shotover-proxy/tests/test-configs/redis/tls/redis.conf
diff --git a/test-helpers/src/docker_compose.rs b/test-helpers/src/docker_compose.rs
@@ -44,6 +44,11 @@ pub fn get_image_waiters() -> &'static [Image] {
  log_regex_to_wait_for: r"Ready to accept connections",
  timeout: 120,
  },
+ Image {
+ name: "bitnami/redis:6.2.13-debian-11-r73",
+ log_regex_to_wait_for: r"Ready to accept connections",
+ timeout: 120,
+ },
  Image {
  name: "bitnami/redis-cluster:6.2.12-debian-11-r26",
  //`Cluster state changed` is created by the node services