Updated documentation

Author: mblaschke

documentation/CUSTOMIZE.md

@@ -9,7 +9,7 @@ You can add custom shell commands in `docker/main/{DISTRIBUTION}/bin/customizati
 
 ## Custom php.ini directives
 
-Modify the `docker/main/{DISTRIBUTION}/conf/php.ini`, it will be added on top of the default php.ini so
+Modify the `etc/php/development.ini` or `etc/php/production.ini`, it will be added on top of the default php.ini so
 you can overwrite any directives.
 
 After modification rebuild your `main` container:

documentation/DOCKER-INFO.md

@@ -6,9 +6,8 @@
 
 Container                 | Description
 ------------------------- | -------------------------------
-main                      | Main container with PHP-FPM and tools (your entrypoint for bash, php and other stuff)
+main                      | Main container with nginx/apache and PHP-FPM and tools (your entrypoint for bash, php and other stuff)
 storage                   | Storage container, eg. for Solr data
-web                       | Apache HTTPD or Nginx webserver
 mysql                     | MySQL database
 postgres (optional)       | PostgreSQL database
 solr (optional)           | Apache Solr server

documentation/DOCKER-QUICKSTART.md

@@ -7,6 +7,8 @@
 Create and start containers (eg. first start):
 
 ```bash
+# copy favorite docker-compose.*.yml to docker-compose.yml
+cp docker-compose.development.yml docker-compose.yml
 docker-compose up -d
 ```
 
@@ -52,8 +54,8 @@ docker-compose logs
 # ... or only php
 docker-compose logs main
 
-# ... or only php and webserver
-docker-compose logs main web
+# ... or only main and mysql
+docker-compose logs main mysql
 ```
 
 CLI script (defined in docker-env.yml)

documentation/DOCKER-STARTUP.md

@@ -9,6 +9,10 @@ Checkout this project and create and run the Docker containers using [docker-com
 ```bash
 git clone https://github.com/webdevops/php-docker-boilerplate.git projectname
 cd projectname
+
+# copy favorite docker-compose.*.yml to docker-compose.yml
+cp docker-compose.development.yml docker-compose.yml
+
 docker-compose up -d
 ```
 

documentation/INSTALL.md

@@ -12,7 +12,7 @@
 If you want to run a Docker VM make sure you're using VMware or Parallels Desktop because of
 the much faster virtualisation (networking, disk access, shared folders) compared to VirtualBox.
 
-There is also a [Vagrant VM for VirtualBox, VMware and Parallels](https://github.com/webdevops/vagrant-development)
+There is also a [Vagrant VM for VirtualBox, VMware and Parallels](https://github.com/webdevops/vagrant-docker-vm)
 with a mailcatcher (Postfix with Dovecot, catches all outgoing mails).
 
 _Warning:_ Boot2docker ist not recommended because of slow/buggy file sharing between host and guest and there is no
@@ -29,8 +29,8 @@ git clone --recursive https://github.com/webdevops/php-docker-boilerplate.git pr
 
 cd projectname
 
-# for local development (shared volumes)
-cp docker-compose-development.yml docker-compose.yml
+# copy favorite docker-compose.*.yml to docker-compose.yml
+cp docker-compose.development.yml docker-compose.yml
 
 docker-compose up -d
 ```

documentation/PROJECT-EXISTING.md

@@ -15,7 +15,7 @@ or manually
 git clone --recursive https://github..../ code/
 ```
 
-Check `DOCUMENT_ROOT` and `DOCUMENT_INDEX` in `docker-env.yml`
+Check `DOCUMENT_ROOT` and `DOCUMENT_INDEX` in `docker-environment.yml`
 
 ## Cli runner
 

documentation/PROJECT-SYMFONY.md

@@ -8,7 +8,7 @@
 make create symfony
 ```
 
-And change `DOCUMENT_ROOT` and `DOCUMENT_ROOT` in `docker-env.yml`:
+And change `DOCUMENT_ROOT` and `DOCUMENT_ROOT` in `docker-environment.yml`:
 
     DOCUMENT_ROOT=code/web/
     DOCUMENT_INDEX=app_dev.php

documentation/SERVICES.md

@@ -2,7 +2,7 @@
 
 # Services
 
-### Web (Nginx or Apache HTTPd)
+### Main (Nginx or Apache HTTPd)
 
 Setting       | Value
 ------------- | -------------

documentation/TROUBLESHOOTING.md

@@ -4,13 +4,13 @@
 
 ## Startup or (docker) linking errors (safe reset)
 
-If you got any startup issues you can try to rebuild `main` and `web` containers.
+If you got any startup issues you can try to rebuild `main` containers.
 You won't lose any data with this way - it's a safe reset.
 
 ```bash
 docker-compose stop
-docker-compose rm --force main web
-docker-compose build --no-cache main web
+docker-compose rm --force main
+docker-compose build --no-cache main
 docker-compose up -d
 ```
 

documentation/UPDATE.md

@@ -7,7 +7,7 @@
 If you have cloned the git repository it's safe to pull the new version.
 
 If you have used a zip file make sure to replace the `docker/` directory and also
-update `docker-compose.yml` and `docker-env.yml`.
+update `docker-compose.yml` and `docker-environment.yml`.
 
 For [changes see CHANGELOG.md](/CHANGELOG.md)