From a9f458ce9f74867457da125d6591cbf7469bad21 Mon Sep 17 00:00:00 2001 From: marceljd Date: Tue, 22 Jan 2019 05:14:36 +0000 Subject: [PATCH] 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 e9c7c733..8f4b7ec7 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 64c0570f..97c69299 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 424ef057..b48e54f1 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 aaec5a2e..2c3f125e 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 30aee4d9..fd2e5fc1 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 d300dd0a..8f4b7ec7 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 d300dd0a..8f4b7ec7 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 d300dd0a..8f4b7ec7 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 d300dd0a..8f4b7ec7 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 d300dd0a..8f4b7ec7 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 d300dd0a..8f4b7ec7 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 d300dd0a..8f4b7ec7 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 d300dd0a..8f4b7ec7 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 d300dd0a..8f4b7ec7 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 06189890..740db13f 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.