Merge branch 'release/2.1.0'

# Conflicts:
#	README.md

Author: mblaschke

.gitignore

@@ -2,4 +2,4 @@
 .idea
 nbproject
 /backup/*
-/htdocs/*
+/code/*

Makefile

@@ -45,7 +45,7 @@ deploy:
 	bash bin/deploy.sh
 
 clean:
-	test -d htdocs/typo3temp && { rm -rf htdocs/typo3temp/*; }
+	test -d code/typo3temp && { rm -rf code/typo3temp/*; }
 
 bash:
 	docker-compose run --rm main bash

README-NEOS.md

@@ -10,15 +10,18 @@ For the first NEOS setup (make sure [composer](https://getcomposer.org/) is inst
 
 or
 
-    $ rm -f htdocs/.gitkeep
-    $ composer create-project typo3/neos-base-distribution htdocs/
-    $ touch htdocs/.gitkeep
+    $ rm -f code/.gitkeep
+    $ composer create-project typo3/neos-base-distribution code/
+    $ touch code/.gitkeep
 
 
+And change DOCUMENT_ROOT in docuer-env.yml:
+
+    DOCUMENT_ROOT=code/Web/
+
 Feel free to modify your NEOS installation in your htdocs (a shared folder of Docker),
 most of the time there is no need to enter any Docker container.
 
-
 ## NEOS cli runner
 
 You can run one-shot command inside the `TYPO3` service container:

README-TYPO3.md

@@ -10,9 +10,9 @@ For the first TYPO3 setup (make sure [composer](https://getcomposer.org/) is ins
 
 or
 
-    $ rm -f htdocs/.gitkeep
-    $ composer create-project typo3/cms-base-distribution htdocs/
-    $ touch htdocs/FIRST_INSTALL htdocs/.gitkeep
+    $ rm -f code/.gitkeep
+    $ composer create-project typo3/cms-base-distribution code/
+    $ touch htdocs/FIRST_INSTALL code/.gitkeep
 
 
 Feel free to modify your TYPO3 installation in your htdocs (a shared folder of Docker),

README.md

@@ -63,6 +63,17 @@ Recreate containers (if there is any issue or just to start from a clean build)
     $ docker-compose build --no-cache
     $ docker-compose up -d
 
+Logs (eg. for debugging)
+
+    $ docker-compose logs
+
+    # or only php
+    $ docker-compose logs main
+
+    # or only php and nginx
+    $ docker-compose logs main
+
+
 ## Create new project
 
 First create and run the Docker containers using [docker-compose](https://github.com/docker/compose):
@@ -74,7 +85,7 @@ Now create the project:
 - [Create new TYPO3](README-TYPO3.md)
 - [Create new NEOS](README-NEOS.md)
 
-For an existing project just put your files into htdocs/ folder or use git to clone your project into htdocs.
+For an existing project just put your files into code/ folder or use git to clone your project into code/.
 
 
 ## Informations
@@ -188,7 +199,7 @@ Setting                 | Value
 Hostname                | IP or Hostname of VM
 Port                    | 8000
 Use path mappings       | Check
-Path mapping of htdocs  | /docker/htdocs/
+Path mapping of code    | /docker/code/
 
 Add a debug connection (Run -> Edit -> Connections) and create a new connection.
 
@@ -205,7 +216,7 @@ Save, set a break point and test the debugger.
 Use this boilerplate as template and customize it for each project. Put this Docker
 configuration for each project into seperate git repositories.
 
-Now set your existing project repository to be a git submodule in htdocs/.
+Now set your existing project repository to be a git submodule in code/.
 Every developer now needs only to clone the Docker repository with **--recursive**
 to get both, the Docker configuration and the TYPO3 installation.
 
@@ -215,4 +226,4 @@ For better useability track a whole branch (eg. develop or master) as submodule
 
 This Docker layout is based on https://github.com/denderello/symfony-docker-example/
 
-Thanks to [cron IT GmbH](http://www.cron.eu/) for the inspiration for this Docker boilerplate.
+Thanks to [cron IT GmbH](http://www.cron.eu/) for the inspiration for this Docker boilerplate.

bin/.config.sh

@@ -22,7 +22,7 @@ fi
 
 SCRIPT_DIR=$(dirname $($READLINK -f "$0"))
 ROOT_DIR=$($READLINK -f "$SCRIPT_DIR/../")
-TYPO3_DIR=$($READLINK -f "$ROOT_DIR/htdocs")
+CODE_DIR=$($READLINK -f "$ROOT_DIR/code")
 
 BACKUP_DIR=$($READLINK -f "$ROOT_DIR/backup")
 BACKUP_SOLR_FILE='solr.cores.tbz2'

bin/create-project.sh

@@ -12,25 +12,25 @@ if [ "$#" -ne 1 ]; then
     exit 1
 fi
 
-mkdir -p -- "$TYPO3_DIR/"
+mkdir -p -- "$CODE_DIR/"
 
-rm -f -- "$TYPO3_DIR/.gitkeep"
+rm -f -- "$CODE_DIR/.gitkeep"
 
 case "$1" in
     ###################################
     ## TYPO3 CMS
     ###################################
     "cms")
-        execInDir "$TYPO3_DIR" "composer create-project typo3/cms-base-distribution \"$TYPO3_DIR\""
-        execInDir "$TYPO3_DIR" "touch FIRST_INSTALL"
+        execInDir "$CODE_DIR" "composer create-project typo3/cms-base-distribution \"$CODE_DIR\""
+        execInDir "$CODE_DIR" "touch FIRST_INSTALL"
         ;;
 
     ###################################
     ## TYPO3 NEOS
     ###################################
     "neos")
-        execInDir "$TYPO3_DIR" "composer create-project typo3/neos-base-distribution \"$TYPO3_DIR\""
+        execInDir "$CODE_DIR" "composer create-project typo3/neos-base-distribution \"$CODE_DIR\""
         ;;
 esac
 
-touch -- "$TYPO3_DIR/.gitkeep"
+touch -- "$CODE_DIR/.gitkeep"

bin/deploy.sh

@@ -13,8 +13,8 @@ source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.config.sh"
 
 sectionHeader "Checking TYPO3 installation ..."
 
-if [ ! -d "$TYPO3_DIR/fileadmin" -o ! -d "$TYPO3_DIR/typo3conf/ext/" ]; then
-    errorMsg "Either $TYPO3_DIR/fileadmin or $TYPO3_DIR/typo3conf/ext/ doesn't exists"
+if [ ! -d "$CODE_DIR/fileadmin" -o ! -d "$CODE_DIR/typo3conf/ext/" ]; then
+    errorMsg "Either $CODE_DIR/fileadmin or $CODE_DIR/typo3conf/ext/ doesn't exists"
     exit 1
 fi
 
@@ -24,9 +24,9 @@ fi
 
 sectionHeader "Checking for composer.json ..."
 
-if [ -f "htdocs/composer.json" ]; then
+if [ -f "$CODE_DIR/composer.json" ]; then
     # Install composer
-    execInDir "$TYPO3_DIR" "composer install --no-dev --no-interaction"
+    execInDir "$CODE_DIR" "composer install --no-dev --no-interaction"
 fi
 
 #######################################
@@ -35,7 +35,7 @@ fi
 
 sectionHeader "Checking for bower.json ..."
 
-find "$TYPO3_DIR/fileadmin" "$TYPO3_DIR/typo3conf/ext/" -type f -name 'bower.json' | while read FILE; do
+find "$CODE_DIR/fileadmin" "$CODE_DIR/typo3conf/ext/" -type f -name 'bower.json' | while read FILE; do
     BOWER_JSON_DIR=$(dirname $($READLINK -f "$FILE"))
 
     execInDir "$BOWER_JSON_DIR" "bower install --silent"
@@ -48,7 +48,7 @@ done
 
 sectionHeader "Checking for package.json (npm) ..."
 
-find "$TYPO3_DIR/fileadmin" "$TYPO3_DIR/typo3conf/ext/" -type f -name 'package.json' | while read FILE; do
+find "$CODE_DIR/fileadmin" "$CODE_DIR/typo3conf/ext/" -type f -name 'package.json' | while read FILE; do
     PACKAGE_JSON_DIR=$(dirname $($READLINK -f "$FILE"))
 
     if [ ! -d "$PACKAGE_JSON_DIR/node_modules/" -a -n "`which npm-cache`" ]; then
@@ -66,6 +66,6 @@ done
 
 sectionHeader "Checking for gulpfile.js in T3 Root ..."
 
-if [ -f "$TYPO3_DIR\gulpfile.js" ]; then
-    execInDir "$TYPO3_DIR" "gulp deploy"
+if [ -f "$CODE_DIR\gulpfile.js" ]; then
+    execInDir "$CODE_DIR" "gulp deploy"
 fi

htdocs/.gitkeep renamed to code/.gitkeep

@@ -24,16 +24,16 @@ nginx:
   env_file:
     - docker-env.yml
 
-#httpd:
-#  build: docker/httpd/
-#  ports:
-#    - 8000:80
-#  links:
-#    - main
-#  volumes_from:
-#    - main
-#  env_file:
-#    - docker-env.yml
+httpd:
+  build: docker/httpd/
+  ports:
+    - 8001:80
+  links:
+    - main
+  volumes_from:
+    - main
+  env_file:
+    - docker-env.yml
 
 mysql:
   build: docker/mysql/