From eecb594bb0e31ae3efe5be95e1326771b0bb38e8 Mon Sep 17 00:00:00 2001 From: Henning Date: Fri, 2 Jun 2017 07:45:11 +0200 Subject: [PATCH 1/2] Fixed environment variables for MariaDB --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index deb0d1ac..c6b5dda1 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ At first make sure you have chosen the right base image (fpm or apache) and adde ## Base version - apache This version will use the apache image and add a mariaDB container. The volumes are set to keep your data persistent. This setup provides **no ssl encryption** and is intended to run behind a proxy. -Make sure to set the variables `MYSQL_ROOT_PW` and `MYSQL_USER_PW` before you run this setup. +Make sure to set the variables `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` before you run this setup. ```yaml version: '2' @@ -104,8 +104,8 @@ services: volumes: - db:/var/lib/mysql environment: - - MYSQL_ROOT_PW= - - MYSQL_USER_PW= + - MYSQL_ROOT_PASSWORD= + - MYSQL_PASSWORD= - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud @@ -124,7 +124,7 @@ When using the FPM image you need another container that acts as web server on p As this setup does **not include ecryption** it should to be run behind a proxy. -Make sure to set the variables `MYSQL_ROOT_PW` and `MYSQL_USER_PW` before you run this setup. +Make sure to set the variables `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` before you run this setup. ```yaml version: '2' @@ -140,8 +140,8 @@ services: volumes: - db:/var/lib/mysql environment: - - MYSQL_ROOT_PW= - - MYSQL_USER_PW= + - MYSQL_ROOT_PASSWORD= + - MYSQL_PASSWORD= - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud From 1f6bcd88be8dd445b7675a0d996606d9263abf58 Mon Sep 17 00:00:00 2001 From: Henning Date: Fri, 2 Jun 2017 07:46:06 +0200 Subject: [PATCH 2/2] Fixed typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c6b5dda1..21d14878 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ services: ## Base version - FPM When using the FPM image you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combindes with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also need access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes_from` option.The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples). -As this setup does **not include ecryption** it should to be run behind a proxy. +As this setup does **not include encryption** it should to be run behind a proxy. Make sure to set the variables `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` before you run this setup.