From aedfe3a34a87c6747d3eddc720b82af4a9294117 Mon Sep 17 00:00:00 2001
From: Dennis Gaida <2392217+DennisGaida@users.noreply.github.com>
Date: Fri, 7 Jan 2022 01:45:21 +0100
Subject: [PATCH] Workaround for redis not supporting secrets

Redis container unfortunately doesn't support secrets and I dislike having secrets in the `.env` file. This workaround adds support for having the password in a docker secret.

Based on a comment from here: https://github.com/docker-library/redis/issues/46#issuecomment-364761650
---
 docker-compose-t2.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/docker-compose-t2.yml b/docker-compose-t2.yml
index 930b190..477a992 100755
--- a/docker-compose-t2.yml
+++ b/docker-compose-t2.yml
@@ -67,6 +67,8 @@ secrets:
     file: $DOCKERDIR/secrets/traefik_pilot_token
   mysql_root_password:
     file: $DOCKERDIR/secrets/mysql_root_password
+  redis_password:
+    file: $DOCKERDIR/secrets/redis_password
 
 ########################### SERVICES
 services:
@@ -496,7 +498,6 @@ services:
     restart: always
     # profiles:
     # - core
-    entrypoint: redis-server --appendonly yes --requirepass $REDIS_PASSWORD --maxmemory 512mb --maxmemory-policy allkeys-lru
     ports:
       - "$REDIS_PORT:6379"
     security_opt:
@@ -505,6 +506,18 @@ services:
       - $DOCKERDIR/appdata/redis/data:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+    environment:
+      - REDIS_PASS_FILE=/run/secrets/redis_password
+    secrets:
+      - redis_password
+    command: [ "sh", "-c",'[ "$$REDIS_PASS_FILE" ] 
+      && (docker-entrypoint.sh --appendonly yes 
+                               --maxmemory 256mb  
+                               --maxmemory-policy allkeys-lru  
+                               --requirepass "$$(cat $$REDIS_PASS_FILE)")  
+      || echo "++++ Redis Password is empty, using default instance ++++"
+      && redis-server' 
+    ]
 
   # phpMyAdmin - Database management
   # Create a new user with admin privileges. Cannot login as MySQL root for some reason.