Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-02-27 06:47:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add DISCOURSE_REDIS_DB to make it configurable (#71811)

Browse Source 
* Add DISCOURSE_REDIS_DB to make it configurable

Signed-off-by: nenych <nenych.m@gmail.com>

* Set 0 as the default DISCOURSE_REDIS_DB value

Signed-off-by: nenych <nenych.m@gmail.com>

* Reset docker-compose

Signed-off-by: nenych <nenych.m@gmail.com>

---------

Signed-off-by: nenych <nenych.m@gmail.com>
This commit is contained in:
Mykhailo Nenych
2024-09-10 12:00:40 +02:00
committed by GitHub
parent 64445597a8
commit a4ed7d0087
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bitnami/discourse/3/debian-12/rootfs/opt/bitnami/scripts/discourse-env.sh
View File

@@ -61,6 +61,7 @@ discourse_env_vars=(
DISCOURSE_REDIS_HOST
DISCOURSE_REDIS_PORT_NUMBER
DISCOURSE_REDIS_PASSWORD
DISCOURSE_REDIS_DB
DISCOURSE_REDIS_USE_SSL
DISCOURSE_HOSTNAME
DISCOURSE_SKIP_INSTALL
@@ -79,6 +80,7 @@ discourse_env_vars=(
REDIS_HOST
REDIS_PORT_NUMBER
REDIS_PASSWORD
REDIS_DB
REDIS_USE_SSL
)
for env_var in "${discourse_env_vars[@]}"; do
@@ -172,6 +174,8 @@ DISCOURSE_REDIS_PORT_NUMBER="${DISCOURSE_REDIS_PORT_NUMBER:-"${REDIS_PORT_NUMBER
export DISCOURSE_REDIS_PORT_NUMBER="${DISCOURSE_REDIS_PORT_NUMBER:-6379}"
DISCOURSE_REDIS_PASSWORD="${DISCOURSE_REDIS_PASSWORD:-"${REDIS_PASSWORD:-}"}"
export DISCOURSE_REDIS_PASSWORD="${DISCOURSE_REDIS_PASSWORD:-}"
DISCOURSE_REDIS_DB="${DISCOURSE_REDIS_DB:-"${REDIS_DB:-}"}"
export DISCOURSE_REDIS_DB="${DISCOURSE_REDIS_DB:-0}"
DISCOURSE_REDIS_USE_SSL="${DISCOURSE_REDIS_USE_SSL:-"${REDIS_USE_SSL:-}"}"
export DISCOURSE_REDIS_USE_SSL="${DISCOURSE_REDIS_USE_SSL:-no}"

2
bitnami/discourse/3/debian-12/rootfs/opt/bitnami/scripts/libdiscourse.sh
View File

@@ -91,6 +91,7 @@ discourse_validate() {
! is_empty_value "$DISCOURSE_REDIS_HOST" && check_resolved_hostname "$DISCOURSE_REDIS_HOST"
! is_empty_value "$DISCOURSE_REDIS_PORT_NUMBER" && check_valid_port "DISCOURSE_REDIS_PORT_NUMBER"
! is_empty_value "$DISCOURSE_REDIS_USE_SSL" && check_yes_no_value "DISCOURSE_REDIS_USE_SSL"
! is_empty_value "$DISCOURSE_REDIS_DB" && is_positive_int "$DISCOURSE_REDIS_DB"
if ! is_file_writable "$DISCOURSE_CONF_FILE"; then
warn "The Discourse configuration file ${DISCOURSE_CONF_FILE} is not writable. Configurations specified via environment variables will not be applied to this file."
is_boolean_yes "$DISCOURSE_ENABLE_CONF_PERSISTENCE" && warn "The DISCOURSE_ENABLE_CONF_PERSISTENCE configuration is enabled but the ${DISCOURSE_CONF_FILE} file is not writable. The file will not be persisted."
@@ -255,6 +256,7 @@ discourse_create_conf_file() {
discourse_conf_set "redis_host" "$DISCOURSE_REDIS_HOST"
discourse_conf_set "redis_port" "$DISCOURSE_REDIS_PORT_NUMBER"
discourse_conf_set "redis_password" "$DISCOURSE_REDIS_PASSWORD"
discourse_conf_set "redis_db" "$DISCOURSE_REDIS_DB"
is_boolean_yes "$DISCOURSE_REDIS_USE_SSL" && discourse_conf_set "redis_use_ssl" true
# SMTP credentials
if ! is_empty_value "$DISCOURSE_SMTP_HOST"; then