Merge branch 'master' into chore/cleanup-TABLES_DEFAULT_ADMIN-flag

This commit is contained in:
Sam Rose 2024-11-04 16:41:23 +00:00 committed by GitHub
commit b8483afcec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions

View File

@ -81,11 +81,17 @@ mkdir -p ${DATA_DIR}/minio
mkdir -p ${DATA_DIR}/redis
chown -R couchdb:couchdb ${DATA_DIR}/couch
sed -i "s#DATA_DIR#${DATA_DIR}#g" /etc/redis/redis.conf
REDIS_CONFIG="/etc/redis/redis.conf"
sed -i "s#DATA_DIR#${DATA_DIR}#g" "${REDIS_CONFIG}"
if [[ -n "${USE_DEFAULT_REDIS_CONFIG}" ]]; then
REDIS_CONFIG=""
fi
if [[ -n "${REDIS_PASSWORD}" ]]; then
redis-server /etc/redis/redis.conf --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 &
redis-server "${REDIS_CONFIG}" --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 &
else
redis-server /etc/redis/redis.conf > /dev/stdout 2>&1 &
redis-server "${REDIS_CONFIG}" > /dev/stdout 2>&1 &
fi
/bbcouch-runner.sh &