From 482b9fcaaa2c8ec5936fcf42e82939b9afedd58d Mon Sep 17 00:00:00 2001 From: dotX12 Date: Sun, 2 Feb 2025 04:03:32 +0300 Subject: [PATCH] Add support for Redis password in configuration files and Dockerfile. --- .gitignore | 1 + Dockerfile | 1 + files/opt/laravel-echo-server/entrypoint.sh | 1 + files/opt/laravel-echo-server/laravel-echo-server.example.json | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a967f10..690869f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /build.cmd +.idea \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index e9c5404..428258d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ ENV \ ECHO_PROTOCOL=http \ ECHO_REDIS_PORT=6379 \ ECHO_REDIS_HOSTNAME=redis \ + ECHO_REDIS_PASSWORD= \ ECHO_DEVMODE=false \ ECHO_CLIENTS=[] \ ECHO_ALLOW_CORS=true \ diff --git a/files/opt/laravel-echo-server/entrypoint.sh b/files/opt/laravel-echo-server/entrypoint.sh index ee00280..6bc5e41 100644 --- a/files/opt/laravel-echo-server/entrypoint.sh +++ b/files/opt/laravel-echo-server/entrypoint.sh @@ -8,6 +8,7 @@ fi sed -i -e "s%{{ ECHO_CLIENTS }}%$ECHO_CLIENTS%g" laravel-echo-server.json sed -i -e "s%{{ ECHO_REDIS_PORT }}%$ECHO_REDIS_PORT%g" laravel-echo-server.json sed -i -e "s%{{ ECHO_REDIS_HOSTNAME }}%$ECHO_REDIS_HOSTNAME%g" laravel-echo-server.json +sed -i -e "s%{{ ECHO_REDIS_PASSWORD }}%$ECHO_REDIS_PASSWORD%g" laravel-echo-server.json sed -i -e "s%{{ ECHO_DEVMODE }}%$ECHO_DEVMODE%g" laravel-echo-server.json sed -i -e "s%{{ ECHO_PROTOCOL }}%$ECHO_PROTOCOL%g" laravel-echo-server.json sed -i -e "s%{{ ECHO_SSL_CERT_PATH }}%$ECHO_SSL_CERT_PATH%g" laravel-echo-server.json diff --git a/files/opt/laravel-echo-server/laravel-echo-server.example.json b/files/opt/laravel-echo-server/laravel-echo-server.example.json index 79aaae4..effec74 100644 --- a/files/opt/laravel-echo-server/laravel-echo-server.example.json +++ b/files/opt/laravel-echo-server/laravel-echo-server.example.json @@ -6,7 +6,8 @@ "databaseConfig": { "redis": { "port": "{{ ECHO_REDIS_PORT }}", - "host": "{{ ECHO_REDIS_HOSTNAME }}" + "host": "{{ ECHO_REDIS_HOSTNAME }}", + "password": "{{ ECHO_REDIS_PASSWORD }}" } }, "devMode": "{{ ECHO_DEVMODE }}",