From 9bf68b0d208c7a1292a96190b43bcf3c59ce0d26 Mon Sep 17 00:00:00 2001 From: psychowood Date: Thu, 4 Jan 2024 20:14:45 +0100 Subject: [PATCH] Feature/enable redis authentication in docker compose files (#2805) * Enable redis authentication in docker-compose files * Update changelog --- CHANGELOG.md | 1 + docker/docker-compose.build.yml | 5 ++++- docker/docker-compose.dev.yml | 3 +++ docker/docker-compose.yml | 5 ++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8fe75066..ec7edcdea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added support for REST APIs (`JSON`) via the scraper configuration +- Enabled the _Redis_ authentication in the `docker-compose` files ### Changed diff --git a/docker/docker-compose.build.yml b/docker/docker-compose.build.yml index 6bb158ddd..933b4bc82 100644 --- a/docker/docker-compose.build.yml +++ b/docker/docker-compose.build.yml @@ -29,8 +29,11 @@ services: - postgres:/var/lib/postgresql/data redis: image: redis:alpine + env_file: + - ../.env + command: ['redis-server', '--requirepass', $REDIS_PASSWORD] healthcheck: - test: ['CMD-SHELL', 'redis-cli ping | grep PONG'] + test: ['CMD-SHELL', 'redis-cli --pass $REDIS_PASSWORD ping | grep PONG'] interval: 10s timeout: 5s retries: 5 diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 7c6e5e28a..a61359a53 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -14,6 +14,9 @@ services: image: redis:alpine container_name: redis restart: unless-stopped + env_file: + - ../.env + command: ['redis-server', '--requirepass', $REDIS_PASSWORD] ports: - ${REDIS_PORT:-6379}:6379 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index d0be3965d..e103a71eb 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -29,8 +29,11 @@ services: - postgres:/var/lib/postgresql/data redis: image: redis:alpine + env_file: + - ../.env + command: ['redis-server', '--requirepass', $REDIS_PASSWORD] healthcheck: - test: ['CMD-SHELL', 'redis-cli ping | grep PONG'] + test: ['CMD-SHELL', 'redis-cli --pass $REDIS_PASSWORD ping | grep PONG'] interval: 10s timeout: 5s retries: 5