Merge pull request #83 from ColorizedMind/master

Fixed README.md
This commit is contained in:
Tilo Spannagel 2017-06-02 12:57:17 +02:00 committed by GitHub
commit 29cfadb778

View File

@ -88,7 +88,7 @@ At first make sure you have chosen the right base image (fpm or apache) and adde
## Base version - apache ## 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. 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 ```yaml
version: '2' version: '2'
@ -104,8 +104,8 @@ services:
volumes: volumes:
- db:/var/lib/mysql - db:/var/lib/mysql
environment: environment:
- MYSQL_ROOT_PW= - MYSQL_ROOT_PASSWORD=
- MYSQL_USER_PW= - MYSQL_PASSWORD=
- MYSQL_DATABASE=nextcloud - MYSQL_DATABASE=nextcloud
- MYSQL_USER=nextcloud - MYSQL_USER=nextcloud
@ -122,9 +122,9 @@ services:
## Base version - FPM ## 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). 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 ```yaml
version: '2' version: '2'
@ -140,8 +140,8 @@ services:
volumes: volumes:
- db:/var/lib/mysql - db:/var/lib/mysql
environment: environment:
- MYSQL_ROOT_PW= - MYSQL_ROOT_PASSWORD=
- MYSQL_USER_PW= - MYSQL_PASSWORD=
- MYSQL_DATABASE=nextcloud - MYSQL_DATABASE=nextcloud
- MYSQL_USER=nextcloud - MYSQL_USER=nextcloud