eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-02-04 04:56:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #7285 from nextcloud/enh/noid/make-redis-port-configurable

Browse source 
make redis port configurable
This commit is contained in:
Simon L. 2025-12-11 12:33:40 +01:00 • committed by GitHub
commit 5622198888
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Containers/nextcloud/Dockerfile
View file

@ -138,7 +138,7 @@ RUN set -ex; \
\ \
{ \ { \
echo 'session.save_handler = redis'; \ echo 'session.save_handler = redis'; \
echo 'session.save_path = "tcp://${REDIS_HOST}:6379?database=${REDIS_DB_INDEX}${REDIS_USER_AUTH}&auth[]=${REDIS_HOST_PASSWORD}"'; \ echo 'session.save_path = "tcp://${REDIS_HOST}:${REDIS_PORT}?database=${REDIS_DB_INDEX}${REDIS_USER_AUTH}&auth[]=${REDIS_HOST_PASSWORD}"'; \
echo 'redis.session.locking_enabled = 1'; \ echo 'redis.session.locking_enabled = 1'; \
echo 'redis.session.lock_retries = -1'; \ echo 'redis.session.lock_retries = -1'; \
echo 'redis.session.lock_wait_time = 10000'; \ echo 'redis.session.lock_wait_time = 10000'; \

6
Containers/nextcloud/config/redis.config.php
View file

@ -9,10 +9,8 @@ if (getenv('REDIS_HOST')) {
), ),
); );
if (getenv('REDIS_HOST_PORT')) { if (getenv('REDIS_PORT')) {
$CONFIG['redis']['port'] = (int) getenv('REDIS_HOST_PORT'); $CONFIG['redis']['port'] = (int) getenv('REDIS_PORT');
} elseif (getenv('REDIS_HOST')[0] != '/') {
$CONFIG['redis']['port'] = 6379;
} }
if (getenv('REDIS_DB_INDEX')) { if (getenv('REDIS_DB_INDEX')) {

2
Containers/nextcloud/entrypoint.sh
View file

@ -27,7 +27,7 @@ fi
# Only start container if Redis is accessible # Only start container if Redis is accessible
# shellcheck disable=SC2153 # shellcheck disable=SC2153
while ! nc -z "$REDIS_HOST" "6379"; do while ! nc -z "$REDIS_HOST" "$REDIS_PORT"; do
echo "Waiting for Redis to start..." echo "Waiting for Redis to start..."
sleep 5 sleep 5
done done

6
Containers/notify-push/start.sh
View file

@ -52,6 +52,10 @@ fi
if [ -z "$REDIS_DB_INDEX" ]; then if [ -z "$REDIS_DB_INDEX" ]; then
REDIS_DB_INDEX=0 REDIS_DB_INDEX=0
fi fi
# Set a default value for REDIS_PORT
if [ -z "$REDIS_PORT" ]; then
REDIS_PORT=6379
fi
# Set a default for db type # Set a default for db type
if [ -z "$DATABASE_TYPE" ]; then if [ -z "$DATABASE_TYPE" ]; then
DATABASE_TYPE=postgres DATABASE_TYPE=postgres
@ -76,7 +80,7 @@ fi
# Set sensitive values as env # Set sensitive values as env
export DATABASE_URL="$DATABASE_TYPE://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:$POSTGRES_PORT/$POSTGRES_DB$CERT_OPTIONS" export DATABASE_URL="$DATABASE_TYPE://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:$POSTGRES_PORT/$POSTGRES_DB$CERT_OPTIONS"
export REDIS_URL="redis://$REDIS_USER:$REDIS_HOST_PASSWORD@$REDIS_HOST/$REDIS_DB_INDEX" export REDIS_URL="redis://$REDIS_USER:$REDIS_HOST_PASSWORD@$REDIS_HOST:$REDIS_PORT/$REDIS_DB_INDEX"
# Run it # Run it
/nextcloud/custom_apps/notify_push/bin/"$CPU_ARCH"/notify_push \ /nextcloud/custom_apps/notify_push/bin/"$CPU_ARCH"/notify_push \

2
Containers/whiteboard/healthcheck.sh
View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
nc -z "$REDIS_HOST" 6379 || exit 0 nc -z "$REDIS_HOST" "$REDIS_PORT" || exit 0
nc -z 127.0.0.1 3002 || exit 1 nc -z 127.0.0.1 3002 || exit 1

4
Containers/whiteboard/start.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Only start container if nextcloud is accessible # Only start container if nextcloud is accessible
while ! nc -z "$REDIS_HOST" 6379; do while ! nc -z "$REDIS_HOST" "$REDIS_PORT"; do
echo "Waiting for redis to start..." echo "Waiting for redis to start..."
sleep 5 sleep 5
done done
@ -11,7 +11,7 @@ if [ -z "$REDIS_DB_INDEX" ]; then
REDIS_DB_INDEX=0 REDIS_DB_INDEX=0
fi fi
export REDIS_URL="redis://$REDIS_USER:$REDIS_HOST_PASSWORD@$REDIS_HOST/$REDIS_DB_INDEX" export REDIS_URL="redis://$REDIS_USER:$REDIS_HOST_PASSWORD@$REDIS_HOST:$REDIS_PORT/$REDIS_DB_INDEX"
# Run it # Run it
exec npm --prefix /app run server:start exec npm --prefix /app run server:start

3
php/containers.json
View file

@ -204,6 +204,7 @@
"POSTGRES_DB=nextcloud_database", "POSTGRES_DB=nextcloud_database",
"POSTGRES_USER=nextcloud", "POSTGRES_USER=nextcloud",
"REDIS_HOST=nextcloud-aio-redis", "REDIS_HOST=nextcloud-aio-redis",
"REDIS_PORT=6379",
"REDIS_HOST_PASSWORD=%REDIS_PASSWORD%", "REDIS_HOST_PASSWORD=%REDIS_PASSWORD%",
"APACHE_HOST=nextcloud-aio-apache", "APACHE_HOST=nextcloud-aio-apache",
"APACHE_PORT=%APACHE_PORT%", "APACHE_PORT=%APACHE_PORT%",
@ -305,6 +306,7 @@
"NEXTCLOUD_HOST=nextcloud-aio-nextcloud", "NEXTCLOUD_HOST=nextcloud-aio-nextcloud",
"TZ=%TIMEZONE%", "TZ=%TIMEZONE%",
"REDIS_HOST=nextcloud-aio-redis", "REDIS_HOST=nextcloud-aio-redis",
"REDIS_PORT=6379",
"REDIS_HOST_PASSWORD=%REDIS_PASSWORD%", "REDIS_HOST_PASSWORD=%REDIS_PASSWORD%",
"POSTGRES_HOST=nextcloud-aio-database", "POSTGRES_HOST=nextcloud-aio-database",
"POSTGRES_PORT=5432", "POSTGRES_PORT=5432",
@ -875,6 +877,7 @@
"JWT_SECRET_KEY=%WHITEBOARD_SECRET%", "JWT_SECRET_KEY=%WHITEBOARD_SECRET%",
"STORAGE_STRATEGY=redis", "STORAGE_STRATEGY=redis",
"REDIS_HOST=nextcloud-aio-redis", "REDIS_HOST=nextcloud-aio-redis",
"REDIS_PORT=6379",
"REDIS_HOST_PASSWORD=%REDIS_PASSWORD%", "REDIS_HOST_PASSWORD=%REDIS_PASSWORD%",
"BACKUP_DIR=/tmp" "BACKUP_DIR=/tmp"
], ],