Merge branch 'release/3.3.0'

# Conflicts:
#	README.md
#	docker/httpd/ssl/server.crt
#	docker/httpd/ssl/server.csr
#	docker/nginx/ssl/server.crt
#	docker/nginx/ssl/server.csr

Author: mblaschke

CHANGELOG.md

@@ -0,0 +1,42 @@
+TYPO3 Docker Boilerplate Changelog
+==================================
+
+3.3.0 - 2015-05-09 - t3cs2015 release
+-------------------------------------
+- Fixed `make mysql-backup`
+- Added `docker/main/bin/customization.sh` for easy customization and faster docker rebuilding
+- Added `CLI_USER` for customizable user in `docker-env.yml` (for `CLI_SCRIPT`)
+- Added ssl (SHA2) for nginx and apache HTTPd
+- Added `/data/cache` for application cache storage (inside `storage` container)
+- Improved `make deploy` (supports all other frameworks now, not only TYPO3)
+- Fixed $HOME variable for shell and cli entrypoint targets (sudo issue)
+- Improved `docker-env.yml` layout with some examples
+
+3.2.0 - 2015-04-26
+------------------
+- Added `mailcatcher` container
+- Added `cli` target for entrypoint in `main` container
+- Smaller improvements
+
+3.0.0 - 2015-04-19
+------------------
+- Added customizeable `PHP_UID` and `PHP_GID` (for www-data user) in `docker-env.yml`
+- Added `PHP_TIMEZONE` in `docker-env.yml`
+- Added advanced logging for php (see docker-compose logs for access, slowlog and errorlog)
+- Added capability for PHP-FPM to trace for slowlog
+- Added possibility to reach webserver from php-container (with dnsmasq) eg. for indexing tasks
+- Readded xdebug
+- Improved configuration
+- Improved database backup
+- Improved container layout
+
+2.1.0 - 2015-04-01
+------------------
+- Added customizeable `DOCUMENT_INDEX` in `docker-env.yml`
+
+2.0.0 - 2015-03-31
+------------------
+- Added customizeable `DOCUMENT_ROOT` in `docker-env.yml`
+- Switched to official nginx
+- Moved `/code/` to `/docker`
+- Fixed some bugs

README.md

@@ -1,24 +1,23 @@
 # Dockerized PHP web project boilerplate
 
-![latest v3.2.0](https://img.shields.io/badge/latest-v3.2.0-green.svg?style=flat)
+![latest v3.3.0](https://img.shields.io/badge/latest-v3.3.0-green.svg?style=flat)
 ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/mblaschke/typo3-docker-boilerplate.svg)](http://isitmaintained.com/project/mblaschke/typo3-docker-boilerplate "Average time to resolve an issue")
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/mblaschke/typo3-docker-boilerplate.svg)](http://isitmaintained.com/project/mblaschke/typo3-docker-boilerplate "Percentage of issues still open")
 
-
-This is a boilerplate utilizing Docker based with support
-for **TYPO3_CONTEXT** and **FLOW_CONTEXT** for TYPO3, FLOW, NEOS.
-It also supports Symfony and any other PHP base project.
+This is an easy customizable docker boilerplate for any PHP based projects like _TYPO3 CMS_, _TYPO3 NEOS_, _TYPO3 FLOW_, _Symfony Framework_ and many other.
 
 Supports:
 
 - Nginx or Apache HTTPd
-- PHP-FPM (with Xdebug and Xhprof)
+- PHP-FPM (with Xdebug)
 - MySQL, MariaDB or PerconaDB
-- Solr (disabled, without EXT:solr configuration)
+- Solr (disabled, with TYPO3 CMS EXT:solr configuration as example)
 - Elasticsearch (disabled, without configuration)
 - Redis (disabled)
 - Memcached (disabled)
+- Mailcatcher (if no mail sandbox is used, eg. [Vagrant Development VM](https://github.com/mblaschke/vagrant-development))
+- Support for `TYPO3_CONTEXT` and `FLOW_CONTEXT` for TYPO3, FLOW, NEOS.
 - maybe more later...
 
 This Docker boilerplate based on the best practises and don't use too much magic.
@@ -27,9 +26,9 @@ Configuration of each docker container is available in the `docker/` directory -
 This boilerplate can also be used for any other web project eg. Symfony, Magento and more.
 Just customize the makefile for your needs
 
-Warning: Don't use this Docker containers for production - they are only for development!
+Warning: Don't use this Docker containers for production - they are only for development. If you find it usefull for production please contact me.
 
-Use can use my [Vagrant Development VM](https://github.com/mblaschke/vagrant-development) for this Docker boilerplate.
+Use can use my [Vagrant Development VM](https://github.com/mblaschke/vagrant-development) for this Docker boilerplate, eg. for easy creating new boilerplate installations with an easy shell command: `ct docker:create directory`
 
 ## Requirements
 
@@ -41,7 +40,7 @@ Use can use my [Vagrant Development VM](https://github.com/mblaschke/vagrant-dev
 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.
 
-For more convenience use [CliTools.phar](https://github.com/mblaschke/vagrant-clitools) (will also run on native Linux, not only Vagrant)
+For more convenience use [CliTools.phar](https://github.com/mblaschke/vagrant-clitools) (will also run on native Linux, not only inside a Vagrant box)
 
 ## Docker short introduction
 
@@ -114,7 +113,7 @@ main                      | Main container with PHP-FPM and tools (your entrypoi
 storage                   | Storage container, eg. for Solr data
 web                       | Apache HTTPD or Nginx webserver
 mysql                     | MySQL database
-solr                      | Apache Solr server
+solr (optional)           | Apache Solr server
 elasticsearch (optional)  | Elasticsearch server
 memcached (optional)      | Memcached server
 redis (optional)          | Redis server
@@ -198,13 +197,22 @@ Setting       | Value
 Host          | memcached
 Port          | 11211
 
+### Mailcatcher
+
+Setting       | Value
+------------- | -------------
+Host          | mail
+SMTP port     | 1025
+Web port      | 1080
+
 ### Environment settings
 
 Environment           | Description
 --------------------- | -------------
 DOCUMENT_ROOT         | Document root for Nginx and Apache HTTPD, can be absolute or relative (to /docker inside the container).
 DOCUMENT_INDEX        | Default document index file for Nginx and Apache HTTPd
 CLI_SCRIPT            | Target for "cli" command of main container
+CLI_USER              | User which should be used to run CLI scripts (normally www-data, equals php-fpm user)
 <br>                  |
 TYPO3_CONTEXT         | Context for TYPO3, can be used for TypoScript conditions and AdditionalConfiguration
 FLOW_CONTEXT          | Context for FLOW and NEOS
@@ -253,7 +261,7 @@ Use this boilerplate as template and customize it for each project. Put this Doc
 configuration for each project into seperate git repositories.
 
 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**
+Every developer now needs only to clone the Docker repository with `--recursive` option
 to get both, the Docker configuration and the TYPO3 installation.
 
 For better useability track a whole branch (eg. develop or master) as submodule and not just a single commit.
@@ -263,3 +271,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.
+Also thanks to Ingo Pfennigstorf for testing and some usefull ideas.

bin/backup.sh

@@ -25,7 +25,7 @@ case "$1" in
         fi
 
         logMsg "Starting MySQL backup..."
-        mysqldump --opt --single-transaction --all-databases | bzip2 > "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}"
+        mysqldump --opt --single-transaction --events --all-databases | bzip2 > "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}"
         ;;
 
     ###################################

bin/deploy.sh

@@ -7,35 +7,30 @@ set -o errexit   ## set -e : exit the script if any statement returns a non-true
 
 source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.config.sh"
 
-#######################################
-## Checks
-#######################################
-
-sectionHeader "Checking TYPO3 installation ..."
-
-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
+function excludeFilter {
+    cat | grep -v -E -e '(/typo3/|/typo3_src|/fileadmin/|/typo3temp/|/uploads/|/Packages/|/Data/|/vendor/)'
+}
 
 #######################################
 ## Composer
 #######################################
 
 sectionHeader "Checking for composer.json ..."
 
-if [ -f "$CODE_DIR/composer.json" ]; then
-    # Install composer
-    execInDir "$CODE_DIR" "composer install --no-dev --no-interaction"
-fi
+find "$CODE_DIR" -type f -name 'composer.json' | excludeFilter | while read FILE; do
+    COMPOSER_JSON_DIR=$(dirname $($READLINK -f "$FILE"))
+
+    execInDir "$COMPOSER_JSON_DIR" "composer install --no-dev --no-interaction"
+done
+
 
 #######################################
 ## Bower
 #######################################
 
 sectionHeader "Checking for bower.json ..."
 
-find "$CODE_DIR/fileadmin" "$CODE_DIR/typo3conf/ext/" -type f -name 'bower.json' | while read FILE; do
+find "$CODE_DIR" -type f -name 'bower.json' | excludeFilter | while read FILE; do
     BOWER_JSON_DIR=$(dirname $($READLINK -f "$FILE"))
 
     execInDir "$BOWER_JSON_DIR" "bower install --silent"
@@ -48,7 +43,7 @@ done
 
 sectionHeader "Checking for package.json (npm) ..."
 
-find "$CODE_DIR/fileadmin" "$CODE_DIR/typo3conf/ext/" -type f -name 'package.json' | while read FILE; do
+find "$CODE_DIR" -type f -name 'package.json' | excludeFilter | 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 +61,8 @@ done
 
 sectionHeader "Checking for gulpfile.js in T3 Root ..."
 
-if [ -f "$CODE_DIR\gulpfile.js" ]; then
-    execInDir "$CODE_DIR" "gulp deploy"
-fi
+find "$CODE_DIR" -type f -name 'package.json' | excludeFilter | while read FILE; do
+    GULPFILE_DIR=$(dirname $($READLINK -f "$FILE"))
+
+    execInDir "$GULPFILE_DIR" "gulp deploy"
+done

docker-compose.yml

@@ -1,7 +1,11 @@
+#######################################
+# Main php container
+#######################################
 main:
   build: docker/main/
   links:
     - mysql
+    #- mail
     #- solr
     #- elasticsearch
     #- redis
@@ -18,6 +22,9 @@ main:
   env_file:
     - docker-env.yml
 
+#######################################
+# Webserver
+#######################################
 web:
   #build: docker/httpd/
   build: docker/nginx/
@@ -32,6 +39,9 @@ web:
   env_file:
     - docker-env.yml
 
+#######################################
+# MySQL server
+#######################################
 mysql:
   build: docker/mysql/
   ports:
@@ -43,6 +53,9 @@ mysql:
   env_file:
     - docker-env.yml
 
+#######################################
+# Solr server
+#######################################
 #solr:
 #  build: docker/solr/
 #  ports:
@@ -54,6 +67,9 @@ mysql:
 #  env_file:
 #    - docker-env.yml
 
+#######################################
+# Elasticsearch
+#######################################
 #elasticsearch:
 #  build: docker/elasticsearch/
 #  ports:
@@ -64,20 +80,39 @@ mysql:
 #  env_file:
 #    - docker-env.yml
 
+#######################################
+# Redis
+#######################################
 #redis:
 #  build: docker/redis/
 #  volumes_from:
 #    - storage
 #  env_file:
 #    - docker-env.yml
 
+#######################################
+# Memcached
+#######################################
 #memcached:
 #  build: docker/memcached/
 #  volumes_from:
 #    - storage
 #  env_file:
 #    - docker-env.yml
 
+#######################################
+# Mailcatcher
+#######################################
+#mail:
+#  build: docker/mail/
+#  ports:
+#    - 1080:1080
+#  env_file:
+#    - docker-env.yml
+
+#######################################
+# Storage
+#######################################
 storage:
   build: docker/storage/
   volumes:

docker-env.yml

@@ -20,8 +20,13 @@ FLOW_REWRITEURLS=1
 SYMFONY_ENV=dev
 SYMFONY_DEBUG=0
 
-# Service settings
+# Mail - Vagrant mail sandbox
 MAIL_GATEWAY=192.168.56.2
+
+# Mail - Mailcatcher
+#MAIL_GATEWAY=mail:1025
+
+# Service settings
 DNS_DOMAIN=vm vm.dev
 
 # MySQL settings
@@ -34,3 +39,6 @@ MYSQL_DATABASE=typo3
 PHP_TIMEZONE=UTC
 PHP_UID=1000
 PHP_GID=1000
+
+# Default cli user (should be www-data)
+CLI_USER=www-data

docker/httpd/ssl/server.crt

@@ -1,4 +1,5 @@
 -----BEGIN CERTIFICATE-----
+<<<<<<< HEAD
 MIIFEjCCAvoCCQDrKLkQ7ypcWzANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJE
 RTEQMA4GA1UECBMHR2VybWFueTEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRl
 MQ0wCwYDVQQDFAQqLnZtMB4XDTE1MDQyOTIxMDIyNloXDTE2MDQyODIxMDIyNlow
@@ -27,4 +28,32 @@ rURpmpCRUiVIuq6noJtSFmKc/zLWXyv8ypofX9JHKtFiJr6DpxrzTtMABLLFMEQx
 kOnuIz7e9Mj/CMoXp68U4MBYhuoapd0u+tv3lXvZSxTdioLJtecG6qc6ZYoTGB7a
 BNAo1sCRQrae0LPt2TAMXos6EA+pqX6WyKrAcopQidy3UMp2PCRXfUgtVPwdiq82
 BAleAIzC
+=======
+MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
+b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
+WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
+DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
+3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
+Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
+9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
+0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
+NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
+FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
+7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
+clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
+GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
+6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
+Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
+CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
+SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
+t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
+NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
+I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
+aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
+vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
+nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
+4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
+VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
+ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
+>>>>>>> release/3.3.0
 -----END CERTIFICATE-----