diff options
| author | Tilo Spannagel <development@tilosp.de> | 2017-06-02 12:57:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-02 12:57:17 +0200 |
| commit | 29cfadb7789313f4c70f3bba2cb7b17f8e5f8432 (patch) | |
| tree | ad92aa747f2919ce6f8b9b694946bb277574c85c | |
| parent | fae8b666219efa5306b6cea7e67df11c89ded7af (diff) | |
| parent | 1f6bcd88be8dd445b7675a0d996606d9263abf58 (diff) | |
Merge pull request #83 from ColorizedMind/master
Fixed README.md
| -rw-r--r-- | README.md | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -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 @@ -122,9 +122,9 @@ 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_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 |