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

redis tls tests use bitnami image #1355

Merged
merged 2 commits into from
Oct 16, 2023
Merged

redis tls tests use bitnami image #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c17ae4
redis tls tests use bitnami image
rukai Oct 6, 2023
8a056db
Merge branch 'main' into redis_tls_use_bitnami
rukai Oct 16, 2023
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
13 changes: 9 additions & 4 deletions shotover-proxy/tests/test-configs/redis/tls-no-client-auth/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
7 changes: 0 additions & 7 deletions shotover-proxy/tests/test-configs/redis/tls-no-client-auth/redis.conf
View file
Open in desktop

This file was deleted.

13 changes: 9 additions & 4 deletions shotover-proxy/tests/test-configs/redis/tls-no-verify-hostname/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 0 additions & 6 deletions shotover-proxy/tests/test-configs/redis/tls-no-verify-hostname/redis.conf
View file
Open in desktop

This file was deleted.

13 changes: 9 additions & 4 deletions shotover-proxy/tests/test-configs/redis/tls/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 0 additions & 6 deletions shotover-proxy/tests/test-configs/redis/tls/redis.conf
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions test-helpers/src/docker_compose.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading