diff options
author | Tilo Spannagel <development@tilosp.de> | 2019-02-07 12:20:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-07 12:20:53 +0100 |
commit | b9ae3256ad5a38f37f4f195ddf965f4b2f408615 (patch) | |
tree | a1401ac506bfbdb52530b82af442d1c9187105b8 | |
parent | 6d7be410e0a09a1a08e49762c7a7901e8bda49f3 (diff) | |
parent | e0de4ab28516a09423e5bb8630bfa93cf1de1bba (diff) |
Merge pull request #600 from marceljd/redis-env-vars
Set Redis through environment variables
19 files changed, 129 insertions, 32 deletions
diff --git a/.config/redis.config.php b/.config/redis.config.php new file mode 100644 index 00000000..5df799f2 --- /dev/null +++ b/.config/redis.config.php @@ -0,0 +1,12 @@ +<?php +if (getenv('REDIS_HOST')) { + $CONFIG = array ( + 'memcache.distributed' => '\OC\Memcache\Redis', + 'memcache.locking' => '\OC\Memcache\Redis', + 'redis' => array( + 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_HOST_PORT') ?: 6379, + ), + ); +} + 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 b0cebe31..00000000 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/redis.config.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -$CONFIG = array ( - 'memcache.locking' => '\OC\Memcache\Redis', - 'redis' => array( - 'host' => '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/app/redis.config.php b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/redis.config.php deleted file mode 100644 index b0cebe31..00000000 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/redis.config.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -$CONFIG = array ( - 'memcache.locking' => '\OC\Memcache\Redis', - 'redis' => array( - 'host' => 'redis', - 'port' => 6379, - ), -); 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/app/redis.config.php b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/redis.config.php deleted file mode 100644 index b0cebe31..00000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/redis.config.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -$CONFIG = array ( - 'memcache.locking' => '\OC\Memcache\Redis', - 'redis' => array( - 'host' => 'redis', - 'port' => 6379, - ), -); 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/app/redis.config.php b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/redis.config.php deleted file mode 100644 index b0cebe31..00000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/redis.config.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -$CONFIG = array ( - 'memcache.locking' => '\OC\Memcache\Redis', - 'redis' => array( - 'host' => 'redis', - 'port' => 6379, - ), -); 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 new file mode 100644 index 00000000..5df799f2 --- /dev/null +++ b/13.0/apache/config/redis.config.php @@ -0,0 +1,12 @@ +<?php +if (getenv('REDIS_HOST')) { + $CONFIG = array ( + 'memcache.distributed' => '\OC\Memcache\Redis', + '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 new file mode 100644 index 00000000..5df799f2 --- /dev/null +++ b/13.0/fpm-alpine/config/redis.config.php @@ -0,0 +1,12 @@ +<?php +if (getenv('REDIS_HOST')) { + $CONFIG = array ( + 'memcache.distributed' => '\OC\Memcache\Redis', + '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 new file mode 100644 index 00000000..5df799f2 --- /dev/null +++ b/13.0/fpm/config/redis.config.php @@ -0,0 +1,12 @@ +<?php +if (getenv('REDIS_HOST')) { + $CONFIG = array ( + 'memcache.distributed' => '\OC\Memcache\Redis', + '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 new file mode 100644 index 00000000..5df799f2 --- /dev/null +++ b/14.0/apache/config/redis.config.php @@ -0,0 +1,12 @@ +<?php +if (getenv('REDIS_HOST')) { + $CONFIG = array ( + 'memcache.distributed' => '\OC\Memcache\Redis', + '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 new file mode 100644 index 00000000..5df799f2 --- /dev/null +++ b/14.0/fpm-alpine/config/redis.config.php @@ -0,0 +1,12 @@ +<?php +if (getenv('REDIS_HOST')) { + $CONFIG = array ( + 'memcache.distributed' => '\OC\Memcache\Redis', + '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 new file mode 100644 index 00000000..5df799f2 --- /dev/null +++ b/14.0/fpm/config/redis.config.php @@ -0,0 +1,12 @@ +<?php +if (getenv('REDIS_HOST')) { + $CONFIG = array ( + 'memcache.distributed' => '\OC\Memcache\Redis', + '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 new file mode 100644 index 00000000..5df799f2 --- /dev/null +++ b/15.0/apache/config/redis.config.php @@ -0,0 +1,12 @@ +<?php +if (getenv('REDIS_HOST')) { + $CONFIG = array ( + 'memcache.distributed' => '\OC\Memcache\Redis', + '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 new file mode 100644 index 00000000..5df799f2 --- /dev/null +++ b/15.0/fpm-alpine/config/redis.config.php @@ -0,0 +1,12 @@ +<?php +if (getenv('REDIS_HOST')) { + $CONFIG = array ( + 'memcache.distributed' => '\OC\Memcache\Redis', + '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 new file mode 100644 index 00000000..5df799f2 --- /dev/null +++ b/15.0/fpm/config/redis.config.php @@ -0,0 +1,12 @@ +<?php +if (getenv('REDIS_HOST')) { + $CONFIG = array ( + 'memcache.distributed' => '\OC\Memcache\Redis', + 'memcache.locking' => '\OC\Memcache\Redis', + 'redis' => array( + 'host' => getenv('REDIS_HOST'), + 'port' => getenv('REDIS_HOST_PORT') ?: 6379, + ), + ); +} + @@ -130,7 +130,12 @@ 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_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. # 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. |