Refactoring

Author: mblaschke

README.md

@@ -1,11 +1,11 @@
 # Dockerized PHP web project boilerplate
 
-![latest v3.5.0](https://img.shields.io/badge/latest-v3.5.0-green.svg?style=flat)
+[![latest v4.0.0](https://img.shields.io/badge/latest-v4.0.0-green.svg?style=flat)](https://github.com/mblaschke/php-docker-boilerplate/releases/tag/4.0.0)
 ![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/php-docker-boilerplate.svg)](http://isitmaintained.com/project/mblaschke/php-docker-boilerplate "Average time to resolve an issue")
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/mblaschke/php-docker-boilerplate.svg)](http://isitmaintained.com/project/mblaschke/php-docker-boilerplate "Percentage of issues still open")
 
-This is an easy customizable docker boilerplate for any PHP based projects like _Symfony Framework_, _CakePHP_ and many other frameworks or applications.
+This is an easy customizable docker boilerplate for any PHP based projects like _Symfony Framework_, _CakePHP_, _Yii_ and many other frameworks or applications.
 
 Supports:
 

docker-compose.yml

@@ -2,8 +2,8 @@
 # Main php container
 #######################################
 main:
-  build: docker/main/ubuntu  # dynamic ubuntu version (ansible provisioning)
-  #build: docker/main/centos # dynamic centos version (ansible provisioning)
+  build: docker/main/ubuntu      # dynamic ubuntu version (ansible provisioning)
+  #build: docker/main/centos     # dynamic centos version (ansible provisioning)
   links:
     - mysql
     #- postgres
@@ -29,10 +29,8 @@ main:
 # Webserver
 #######################################
 web:
-  # Apache HTTPD webserver
-  build: docker/httpd/
-  # Nginx webserver
-  #build: docker/nginx/
+  build: docker/web/httpd/   # Apache HTTPD webserver
+  #build: docker/web/nginx/  # Nginx
   ports:
     - 8000:80
     - 8443:443
@@ -48,7 +46,7 @@ web:
 # MySQL server
 #######################################
 mysql:
-  build: docker/mysql/
+  build: docker/mysql/  # MySQL, MariaDB or PerconaDB
   ports:
     - 13306:3306
   volumes_from:

docker-env.yml

@@ -21,9 +21,17 @@ CLI_SCRIPT=php index.php
 
 #######################################
 # Context environment
+
+# Symfony
 SYMFONY_ENV=dev
 SYMFONY_DEBUG=0
 
+# CakePHP
+CAKE_ENV=dev
+
+# yii
+YII_ENVIRONMENT=Development
+
 #######################################
 # Mail
 

docker/elasticsearch/Dockerfile

@@ -1 +1,12 @@
+#++++++++++++++++++++++++++++++++++++++
+# Elasticsearch Docker container
+#++++++++++++++++++++++++++++++++++++++
+#
+# Official images:
+#
+#   elasticsearch - official Elasticsaerch
+#                   https://registry.hub.docker.com/u/library/elasticsearch/
+#
+#++++++++++++++++++++++++++++++++++++++
+
 FROM elasticsearch

docker/mail/Dockerfile

@@ -1 +1,12 @@
+#++++++++++++++++++++++++++++++++++++++
+# Mailcatcher Docker container
+#++++++++++++++++++++++++++++++++++++++
+#
+# Images:
+#
+#   schickling/mailcatcher
+#       https://registry.hub.docker.com/u/schickling/mailcatcher/
+#
+#++++++++++++++++++++++++++++++++++++++
+
 FROM schickling/mailcatcher

docker/main/centos/Dockerfile

@@ -9,6 +9,7 @@
 # Official images:
 #
 #   centos:7 - PHP 5.4
+#              https://registry.hub.docker.com/u/library/centos/
 #
 #++++++++++++++++++++++++++++++++++++++
 

docker/main/centos/conf/php.ini

@@ -19,6 +19,15 @@ date.timezone = Europe/Berlin
 mysql.default_host = mysql
 mysqli.default_host = mysql
 
+; Zend OPCache
+opcache.enable = 1
+opcache.memory_consumption = 128
+opcache.interned_strings_buffer = 8
+opcache.max_accelerated_files = 4000
+opcache.fast_shutdown = 1
+opcache.enable_cli = 1
+
+; XDebug
 xdebug.remote_enable           = 1
 xdebug.remote_connect_back     = on
 xdebug.idekey                  = "docker"

docker/main/ubuntu/Dockerfile

@@ -15,6 +15,7 @@
 #   ubuntu:14.04 - PHP 5.5, LTS (trusty)
 #   ubuntu:15.04 - PHP 5.6 (vivid)
 #   ubuntu:15.10 - PHP 5.6 (wily)
+#                  https://registry.hub.docker.com/u/library/ubuntu/
 #
 #++++++++++++++++++++++++++++++++++++++
 

docker/main/ubuntu/conf/php.ini

@@ -19,6 +19,15 @@ date.timezone = Europe/Berlin
 mysql.default_host = mysql
 mysqli.default_host = mysql
 
+; Zend OPCache
+opcache.enable = 1
+opcache.memory_consumption = 128
+opcache.interned_strings_buffer = 8
+opcache.max_accelerated_files = 4000
+opcache.fast_shutdown = 1
+opcache.enable_cli = 1
+
+; XDebug
 xdebug.remote_enable           = 1
 xdebug.remote_connect_back     = on
 xdebug.idekey                  = "docker"

docker/main/ubuntu/provision/variables.yml

@@ -37,5 +37,7 @@ DOCKER:
   DNS_DOMAIN: "{{ lookup('env','DNS_DOMAIN') }}"
 
   # Context
-  SYMFONY_ENV:   "{{ lookup('env','SYMFONY_ENV') }}"
-  SYMFONY_DEBUG: "{{ lookup('env','SYMFONY_DEBUG') }}"
+  SYMFONY_ENV:     "{{ lookup('env','SYMFONY_ENV') }}"
+  SYMFONY_DEBUG:   "{{ lookup('env','SYMFONY_DEBUG') }}"
+  CAKE_ENV:        "{{ lookup('env','CAKE_ENV') }}"
+  YII_ENVIRONMENT: "{{ lookup('env','YII_ENVIRONMENT') }}"