From ba4c1359b96a34f9945e5541232223a7ab1a6ce0 Mon Sep 17 00:00:00 2001 From: marceljd Date: Fri, 11 Jan 2019 08:56:57 +0000 Subject: [PATCH 1/9] set redis environment variables Signed-off-by: marceljd --- .config/redis.config.php | 12 ++++++++++++ README.md | 4 ++++ 2 files changed, 16 insertions(+) create mode 100644 .config/redis.config.php diff --git a/.config/redis.config.php b/.config/redis.config.php new file mode 100644 index 0000000..d300dd0 --- /dev/null +++ b/.config/redis.config.php @@ -0,0 +1,12 @@ + '\OC\Memcache\Redis', + 'memcache.locking' => '\OC\Memcache\Redis', + 'redis' => array( + 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_PORT') ?: 6379, + ), + ); +} + diff --git a/README.md b/README.md index 8e4c168..0618989 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,10 @@ The install and update script is only triggered when a default command is used ( - `NEXTCLOUD_UPDATE` (default: _0_) +If you want to use Redis you have to create a seperate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container add: + +- 'REDIS_HOST' (not set by default) Name of Redis container +- 'REDIS_PORT' (optional, default:_6379_) Port number of Redis container. Use only if you use a non-standard port. # Running this image with docker-compose From f2ee88d352f945d773e3b76ffceb2d33d9d1973f Mon Sep 17 00:00:00 2001 From: marceljd Date: Fri, 11 Jan 2019 08:59:08 +0000 Subject: [PATCH 2/9] set redis environment variables Signed-off-by: marceljd --- 13.0/apache/config/redis.config.php | 12 ++++++++++++ 13.0/fpm-alpine/config/redis.config.php | 12 ++++++++++++ 13.0/fpm/config/redis.config.php | 12 ++++++++++++ 14.0/apache/config/redis.config.php | 12 ++++++++++++ 14.0/fpm-alpine/config/redis.config.php | 12 ++++++++++++ 14.0/fpm/config/redis.config.php | 12 ++++++++++++ 15.0/apache/config/redis.config.php | 12 ++++++++++++ 15.0/fpm-alpine/config/redis.config.php | 12 ++++++++++++ 15.0/fpm/config/redis.config.php | 12 ++++++++++++ 9 files changed, 108 insertions(+) create mode 100644 13.0/apache/config/redis.config.php create mode 100644 13.0/fpm-alpine/config/redis.config.php create mode 100644 13.0/fpm/config/redis.config.php create mode 100644 14.0/apache/config/redis.config.php create mode 100644 14.0/fpm-alpine/config/redis.config.php create mode 100644 14.0/fpm/config/redis.config.php create mode 100644 15.0/apache/config/redis.config.php create mode 100644 15.0/fpm-alpine/config/redis.config.php create mode 100644 15.0/fpm/config/redis.config.php diff --git a/13.0/apache/config/redis.config.php b/13.0/apache/config/redis.config.php new file mode 100644 index 0000000..d300dd0 --- /dev/null +++ b/13.0/apache/config/redis.config.php @@ -0,0 +1,12 @@ + '\OC\Memcache\Redis', + 'memcache.locking' => '\OC\Memcache\Redis', + 'redis' => array( + 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_PORT') ?: 6379, + ), + ); +} + diff --git a/13.0/fpm-alpine/config/redis.config.php b/13.0/fpm-alpine/config/redis.config.php new file mode 100644 index 0000000..d300dd0 --- /dev/null +++ b/13.0/fpm-alpine/config/redis.config.php @@ -0,0 +1,12 @@ + '\OC\Memcache\Redis', + 'memcache.locking' => '\OC\Memcache\Redis', + 'redis' => array( + 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_PORT') ?: 6379, + ), + ); +} + diff --git a/13.0/fpm/config/redis.config.php b/13.0/fpm/config/redis.config.php new file mode 100644 index 0000000..d300dd0 --- /dev/null +++ b/13.0/fpm/config/redis.config.php @@ -0,0 +1,12 @@ + '\OC\Memcache\Redis', + 'memcache.locking' => '\OC\Memcache\Redis', + 'redis' => array( + 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_PORT') ?: 6379, + ), + ); +} + diff --git a/14.0/apache/config/redis.config.php b/14.0/apache/config/redis.config.php new file mode 100644 index 0000000..d300dd0 --- /dev/null +++ b/14.0/apache/config/redis.config.php @@ -0,0 +1,12 @@ + '\OC\Memcache\Redis', + 'memcache.locking' => '\OC\Memcache\Redis', + 'redis' => array( + 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_PORT') ?: 6379, + ), + ); +} + diff --git a/14.0/fpm-alpine/config/redis.config.php b/14.0/fpm-alpine/config/redis.config.php new file mode 100644 index 0000000..d300dd0 --- /dev/null +++ b/14.0/fpm-alpine/config/redis.config.php @@ -0,0 +1,12 @@ + '\OC\Memcache\Redis', + 'memcache.locking' => '\OC\Memcache\Redis', + 'redis' => array( + 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_PORT') ?: 6379, + ), + ); +} + diff --git a/14.0/fpm/config/redis.config.php b/14.0/fpm/config/redis.config.php new file mode 100644 index 0000000..d300dd0 --- /dev/null +++ b/14.0/fpm/config/redis.config.php @@ -0,0 +1,12 @@ + '\OC\Memcache\Redis', + 'memcache.locking' => '\OC\Memcache\Redis', + 'redis' => array( + 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_PORT') ?: 6379, + ), + ); +} + diff --git a/15.0/apache/config/redis.config.php b/15.0/apache/config/redis.config.php new file mode 100644 index 0000000..d300dd0 --- /dev/null +++ b/15.0/apache/config/redis.config.php @@ -0,0 +1,12 @@ + '\OC\Memcache\Redis', + 'memcache.locking' => '\OC\Memcache\Redis', + 'redis' => array( + 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_PORT') ?: 6379, + ), + ); +} + diff --git a/15.0/fpm-alpine/config/redis.config.php b/15.0/fpm-alpine/config/redis.config.php new file mode 100644 index 0000000..d300dd0 --- /dev/null +++ b/15.0/fpm-alpine/config/redis.config.php @@ -0,0 +1,12 @@ + '\OC\Memcache\Redis', + 'memcache.locking' => '\OC\Memcache\Redis', + 'redis' => array( + 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_PORT') ?: 6379, + ), + ); +} + diff --git a/15.0/fpm/config/redis.config.php b/15.0/fpm/config/redis.config.php new file mode 100644 index 0000000..d300dd0 --- /dev/null +++ b/15.0/fpm/config/redis.config.php @@ -0,0 +1,12 @@ + '\OC\Memcache\Redis', + 'memcache.locking' => '\OC\Memcache\Redis', + 'redis' => array( + 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_PORT') ?: 6379, + ), + ); +} + From 536fb662127c9dbc05bf10fb0714feef7cdd4bf9 Mon Sep 17 00:00:00 2001 From: marceljd Date: Tue, 15 Jan 2019 19:29:07 +0100 Subject: [PATCH 3/9] Only redis_host without port Signed-off-by: marceljd --- .config/redis.config.php | 1 - 1 file changed, 1 deletion(-) diff --git a/.config/redis.config.php b/.config/redis.config.php index d300dd0..8f4b7ec 100644 --- a/.config/redis.config.php +++ b/.config/redis.config.php @@ -5,7 +5,6 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), - 'port' => getenv('REDIS_PORT') ?: 6379, ), ); } From d1db681058525acfff49f84c72050b04e0d2ccf5 Mon Sep 17 00:00:00 2001 From: marceljd Date: Tue, 15 Jan 2019 19:40:35 +0100 Subject: [PATCH 4/9] Update redis.config.php Signed-off-by: marceljd --- .config/redis.config.php | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/redis.config.php b/.config/redis.config.php index 8f4b7ec..e9c7c73 100644 --- a/.config/redis.config.php +++ b/.config/redis.config.php @@ -5,6 +5,7 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_PORT')?: 6379, ), ); } From a9f458ce9f74867457da125d6591cbf7469bad21 Mon Sep 17 00:00:00 2001 From: marceljd Date: Tue, 22 Jan 2019 05:14:36 +0000 Subject: [PATCH 5/9] Changes to be committed: modified: .config/redis.config.php modified: .examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml modified: .examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml modified: .examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml modified: .examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml modified: 13.0/apache/Dockerfile modified: 13.0/apache/config/redis.config.php modified: 13.0/fpm-alpine/Dockerfile modified: 13.0/fpm-alpine/config/redis.config.php modified: 13.0/fpm/Dockerfile modified: 13.0/fpm/config/redis.config.php modified: 14.0/apache/Dockerfile modified: 14.0/apache/config/redis.config.php modified: 14.0/fpm-alpine/Dockerfile modified: 14.0/fpm-alpine/config/redis.config.php modified: 14.0/fpm/Dockerfile modified: 14.0/fpm/config/redis.config.php modified: 15.0/apache/Dockerfile modified: 15.0/apache/config/redis.config.php modified: 15.0/fpm-alpine/Dockerfile modified: 15.0/fpm-alpine/config/redis.config.php modified: 15.0/fpm/Dockerfile modified: 15.0/fpm/config/redis.config.php modified: README.md Signed-off-by: marceljd --- .config/redis.config.php | 1 - .../insecure/mariadb-cron-redis/apache/docker-compose.yml | 1 + .../insecure/mariadb-cron-redis/fpm/docker-compose.yml | 1 + .../mariadb-cron-redis/apache/docker-compose.yml | 1 + .../with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml | 1 + 13.0/apache/config/redis.config.php | 1 - 13.0/fpm-alpine/config/redis.config.php | 1 - 13.0/fpm/config/redis.config.php | 1 - 14.0/apache/config/redis.config.php | 1 - 14.0/fpm-alpine/config/redis.config.php | 1 - 14.0/fpm/config/redis.config.php | 1 - 15.0/apache/config/redis.config.php | 1 - 15.0/fpm-alpine/config/redis.config.php | 1 - 15.0/fpm/config/redis.config.php | 1 - README.md | 2 +- 15 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.config/redis.config.php b/.config/redis.config.php index e9c7c73..8f4b7ec 100644 --- a/.config/redis.config.php +++ b/.config/redis.config.php @@ -5,7 +5,6 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), - 'port' => getenv('REDIS_PORT')?: 6379, ), ); } diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml index 64c0570..97c6929 100644 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml @@ -25,6 +25,7 @@ services: - nextcloud:/var/www/html environment: - MYSQL_HOST=db + - REDIS_HOST=redis env_file: - db.env depends_on: diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml index 424ef05..b48e54f 100644 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml @@ -23,6 +23,7 @@ services: - nextcloud:/var/www/html environment: - MYSQL_HOST=db + - REDIS_HOST=redis env_file: - db.env depends_on: diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml index aaec5a2..2c3f125 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml @@ -26,6 +26,7 @@ services: - LETSENCRYPT_HOST= - LETSENCRYPT_EMAIL= - MYSQL_HOST=db + - REDIS_HOST=redis env_file: - db.env depends_on: diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml index 30aee4d..fd2e5fc 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml @@ -23,6 +23,7 @@ services: - nextcloud:/var/www/html environment: - MYSQL_HOST=db + - REDIS_HOST=redis env_file: - db.env depends_on: diff --git a/13.0/apache/config/redis.config.php b/13.0/apache/config/redis.config.php index d300dd0..8f4b7ec 100644 --- a/13.0/apache/config/redis.config.php +++ b/13.0/apache/config/redis.config.php @@ -5,7 +5,6 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), - 'port' => getenv('REDIS_PORT') ?: 6379, ), ); } diff --git a/13.0/fpm-alpine/config/redis.config.php b/13.0/fpm-alpine/config/redis.config.php index d300dd0..8f4b7ec 100644 --- a/13.0/fpm-alpine/config/redis.config.php +++ b/13.0/fpm-alpine/config/redis.config.php @@ -5,7 +5,6 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), - 'port' => getenv('REDIS_PORT') ?: 6379, ), ); } diff --git a/13.0/fpm/config/redis.config.php b/13.0/fpm/config/redis.config.php index d300dd0..8f4b7ec 100644 --- a/13.0/fpm/config/redis.config.php +++ b/13.0/fpm/config/redis.config.php @@ -5,7 +5,6 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), - 'port' => getenv('REDIS_PORT') ?: 6379, ), ); } diff --git a/14.0/apache/config/redis.config.php b/14.0/apache/config/redis.config.php index d300dd0..8f4b7ec 100644 --- a/14.0/apache/config/redis.config.php +++ b/14.0/apache/config/redis.config.php @@ -5,7 +5,6 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), - 'port' => getenv('REDIS_PORT') ?: 6379, ), ); } diff --git a/14.0/fpm-alpine/config/redis.config.php b/14.0/fpm-alpine/config/redis.config.php index d300dd0..8f4b7ec 100644 --- a/14.0/fpm-alpine/config/redis.config.php +++ b/14.0/fpm-alpine/config/redis.config.php @@ -5,7 +5,6 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), - 'port' => getenv('REDIS_PORT') ?: 6379, ), ); } diff --git a/14.0/fpm/config/redis.config.php b/14.0/fpm/config/redis.config.php index d300dd0..8f4b7ec 100644 --- a/14.0/fpm/config/redis.config.php +++ b/14.0/fpm/config/redis.config.php @@ -5,7 +5,6 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), - 'port' => getenv('REDIS_PORT') ?: 6379, ), ); } diff --git a/15.0/apache/config/redis.config.php b/15.0/apache/config/redis.config.php index d300dd0..8f4b7ec 100644 --- a/15.0/apache/config/redis.config.php +++ b/15.0/apache/config/redis.config.php @@ -5,7 +5,6 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), - 'port' => getenv('REDIS_PORT') ?: 6379, ), ); } diff --git a/15.0/fpm-alpine/config/redis.config.php b/15.0/fpm-alpine/config/redis.config.php index d300dd0..8f4b7ec 100644 --- a/15.0/fpm-alpine/config/redis.config.php +++ b/15.0/fpm-alpine/config/redis.config.php @@ -5,7 +5,6 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), - 'port' => getenv('REDIS_PORT') ?: 6379, ), ); } diff --git a/15.0/fpm/config/redis.config.php b/15.0/fpm/config/redis.config.php index d300dd0..8f4b7ec 100644 --- a/15.0/fpm/config/redis.config.php +++ b/15.0/fpm/config/redis.config.php @@ -5,7 +5,6 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), - 'port' => getenv('REDIS_PORT') ?: 6379, ), ); } diff --git a/README.md b/README.md index 0618989..740db13 100644 --- a/README.md +++ b/README.md @@ -133,8 +133,8 @@ The install and update script is only triggered when a default command is used ( If you want to use Redis you have to create a seperate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container add: - 'REDIS_HOST' (not set by default) Name of Redis container -- 'REDIS_PORT' (optional, default:_6379_) Port number of Redis container. Use only if you use a non-standard port. +The use of Redis is recommended to prevent file locking problems. See the examples for further instructions. # Running this image with docker-compose The easiest way to get a fully featured and functional setup is using a `docker-compose` file. There are too many different possibilities to setup your system, so here are only some examples what you have to look for. From 2e481a86eed7dcac7f5076a9ee90f4f63764677f Mon Sep 17 00:00:00 2001 From: marceljd Date: Tue, 22 Jan 2019 11:14:03 +0100 Subject: [PATCH 6/9] Updated ' to ` for better formatting Signed-off-by: marceljd --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 740db13..72b42f1 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ The install and update script is only triggered when a default command is used ( If you want to use Redis you have to create a seperate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container add: -- 'REDIS_HOST' (not set by default) Name of Redis container +- `REDIS_HOST` (not set by default) Name of Redis container The use of Redis is recommended to prevent file locking problems. See the examples for further instructions. From b3b6def923dfd2288f2b42aba382bbf78e5ca607 Mon Sep 17 00:00:00 2001 From: marceljd Date: Sun, 27 Jan 2019 07:28:38 +0000 Subject: [PATCH 7/9] On branch redis-env-vars added REDIS_HOST_PORT Changes to be committed: modified: .config/redis.config.php modified: README.md Signed-off-by: marceljd --- .config/redis.config.php | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/.config/redis.config.php b/.config/redis.config.php index 8f4b7ec..5df799f 100644 --- a/.config/redis.config.php +++ b/.config/redis.config.php @@ -5,6 +5,7 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_HOST_PORT') ?: 6379, ), ); } diff --git a/README.md b/README.md index 72b42f1..23e2fa6 100644 --- a/README.md +++ b/README.md @@ -133,6 +133,7 @@ The install and update script is only triggered when a default command is used ( If you want to use Redis you have to create a seperate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container add: - `REDIS_HOST` (not set by default) Name of Redis container +- `REDIS_HOST_PORT` (default: _6379_) Optional port for Redis, only use for external Redis servers that run on non-standard ports. The use of Redis is recommended to prevent file locking problems. See the examples for further instructions. From d3cd3b812fc75ffaa314c6d56f5343830e747774 Mon Sep 17 00:00:00 2001 From: marceljd Date: Sun, 27 Jan 2019 07:31:30 +0000 Subject: [PATCH 8/9] On branch redis-env-vars run update.sh Changes to be committed: modified: 13.0/apache/config/redis.config.php modified: 13.0/fpm-alpine/config/redis.config.php modified: 13.0/fpm/config/redis.config.php modified: 14.0/apache/config/redis.config.php modified: 14.0/fpm-alpine/config/redis.config.php modified: 14.0/fpm/config/redis.config.php modified: 15.0/apache/config/redis.config.php modified: 15.0/fpm-alpine/config/redis.config.php modified: 15.0/fpm/config/redis.config.php Signed-off-by: marceljd --- 13.0/apache/config/redis.config.php | 1 + 13.0/fpm-alpine/config/redis.config.php | 1 + 13.0/fpm/config/redis.config.php | 1 + 14.0/apache/config/redis.config.php | 1 + 14.0/fpm-alpine/config/redis.config.php | 1 + 14.0/fpm/config/redis.config.php | 1 + 15.0/apache/config/redis.config.php | 1 + 15.0/fpm-alpine/config/redis.config.php | 1 + 15.0/fpm/config/redis.config.php | 1 + 9 files changed, 9 insertions(+) diff --git a/13.0/apache/config/redis.config.php b/13.0/apache/config/redis.config.php index 8f4b7ec..5df799f 100644 --- a/13.0/apache/config/redis.config.php +++ b/13.0/apache/config/redis.config.php @@ -5,6 +5,7 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_HOST_PORT') ?: 6379, ), ); } diff --git a/13.0/fpm-alpine/config/redis.config.php b/13.0/fpm-alpine/config/redis.config.php index 8f4b7ec..5df799f 100644 --- a/13.0/fpm-alpine/config/redis.config.php +++ b/13.0/fpm-alpine/config/redis.config.php @@ -5,6 +5,7 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_HOST_PORT') ?: 6379, ), ); } diff --git a/13.0/fpm/config/redis.config.php b/13.0/fpm/config/redis.config.php index 8f4b7ec..5df799f 100644 --- a/13.0/fpm/config/redis.config.php +++ b/13.0/fpm/config/redis.config.php @@ -5,6 +5,7 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_HOST_PORT') ?: 6379, ), ); } diff --git a/14.0/apache/config/redis.config.php b/14.0/apache/config/redis.config.php index 8f4b7ec..5df799f 100644 --- a/14.0/apache/config/redis.config.php +++ b/14.0/apache/config/redis.config.php @@ -5,6 +5,7 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_HOST_PORT') ?: 6379, ), ); } diff --git a/14.0/fpm-alpine/config/redis.config.php b/14.0/fpm-alpine/config/redis.config.php index 8f4b7ec..5df799f 100644 --- a/14.0/fpm-alpine/config/redis.config.php +++ b/14.0/fpm-alpine/config/redis.config.php @@ -5,6 +5,7 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_HOST_PORT') ?: 6379, ), ); } diff --git a/14.0/fpm/config/redis.config.php b/14.0/fpm/config/redis.config.php index 8f4b7ec..5df799f 100644 --- a/14.0/fpm/config/redis.config.php +++ b/14.0/fpm/config/redis.config.php @@ -5,6 +5,7 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_HOST_PORT') ?: 6379, ), ); } diff --git a/15.0/apache/config/redis.config.php b/15.0/apache/config/redis.config.php index 8f4b7ec..5df799f 100644 --- a/15.0/apache/config/redis.config.php +++ b/15.0/apache/config/redis.config.php @@ -5,6 +5,7 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_HOST_PORT') ?: 6379, ), ); } diff --git a/15.0/fpm-alpine/config/redis.config.php b/15.0/fpm-alpine/config/redis.config.php index 8f4b7ec..5df799f 100644 --- a/15.0/fpm-alpine/config/redis.config.php +++ b/15.0/fpm-alpine/config/redis.config.php @@ -5,6 +5,7 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_HOST_PORT') ?: 6379, ), ); } diff --git a/15.0/fpm/config/redis.config.php b/15.0/fpm/config/redis.config.php index 8f4b7ec..5df799f 100644 --- a/15.0/fpm/config/redis.config.php +++ b/15.0/fpm/config/redis.config.php @@ -5,6 +5,7 @@ if (getenv('REDIS_HOST')) { 'memcache.locking' => '\OC\Memcache\Redis', 'redis' => array( 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_HOST_PORT') ?: 6379, ), ); } From e0de4ab28516a09423e5bb8630bfa93cf1de1bba Mon Sep 17 00:00:00 2001 From: marceljd Date: Sun, 27 Jan 2019 15:05:57 +0000 Subject: [PATCH 9/9] removed old redis.config.php files On branch redis-env-vars Changes to be committed: deleted: ../../apache/app/redis.config.php deleted: redis.config.php deleted: ../../../../with-nginx-proxy/mariadb-cron-redis/apache/app/redis.config.php deleted: ../../../../with-nginx-proxy/mariadb-cron-redis/fpm/app/redis.config.php Signed-off-by: marceljd --- .../mariadb-cron-redis/apache/app/redis.config.php | 8 -------- .../insecure/mariadb-cron-redis/fpm/app/redis.config.php | 8 -------- .../mariadb-cron-redis/apache/app/redis.config.php | 8 -------- .../mariadb-cron-redis/fpm/app/redis.config.php | 8 -------- 4 files changed, 32 deletions(-) delete mode 100644 .examples/docker-compose/insecure/mariadb-cron-redis/apache/app/redis.config.php delete mode 100644 .examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/redis.config.php delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/redis.config.php delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/redis.config.php diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/redis.config.php b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/redis.config.php deleted file mode 100644 index b0cebe3..0000000 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/redis.config.php +++ /dev/null @@ -1,8 +0,0 @@ - '\OC\Memcache\Redis', - 'redis' => array( - 'host' => 'redis', - 'port' => 6379, - ), -); diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/redis.config.php b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/redis.config.php deleted file mode 100644 index b0cebe3..0000000 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/redis.config.php +++ /dev/null @@ -1,8 +0,0 @@ - '\OC\Memcache\Redis', - 'redis' => array( - 'host' => 'redis', - 'port' => 6379, - ), -); diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/redis.config.php b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/redis.config.php deleted file mode 100644 index b0cebe3..0000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/redis.config.php +++ /dev/null @@ -1,8 +0,0 @@ - '\OC\Memcache\Redis', - 'redis' => array( - 'host' => 'redis', - 'port' => 6379, - ), -); diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/redis.config.php b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/redis.config.php deleted file mode 100644 index b0cebe3..0000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/redis.config.php +++ /dev/null @@ -1,8 +0,0 @@ - '\OC\Memcache\Redis', - 'redis' => array( - 'host' => 'redis', - 'port' => 6379, - ), -);