Merge branch 'release/5.1.1'

mblaschke · mblaschke · commit ebc0b9549a46 · 2016-05-24T23:06:12.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 PHP Docker Boilerplate Changelog
 ==================================
 
+5.1.1 - 2016-05-24
+------------------
+- Fixed Docker image names in Dockerfile.development
+- Updated nginx and apache vhost configuration
+
 5.1.0 - 2016-05-23
 ------------------
 - Add support for new WebDevOps Docker images 0.5.0 and up
diff --git a/Dockerfile.cloud b/Dockerfile.cloud
@@ -7,39 +7,35 @@
 #  ubuntu-14.04 -> PHP 5.5         (trusty)   LTS
 #  ubuntu-15.04 -> PHP 5.6         (vivid)
 #  ubuntu-15.10 -> PHP 5.6         (wily)
-#  ubuntu-16.04 -> PHP 5.6 and 7.0 (xenial)   LTS
+#  ubuntu-16.04 -> PHP 7.0         (xenial)   LTS
 #  centos-7     -> PHP 5.4
 #  debian-7     -> PHP 5.4         (wheezy)
 #  debian-8     -> PHP 5.6 and 7.x (jessie)
-#  debian-9     -> PHP 5.6 and 7.0 (stretch)
+#  debian-9     -> PHP 7.0         (stretch)
 #
 # Apache:
 #   webdevops/php-apache:ubuntu-12.04
 #   webdevops/php-apache:ubuntu-14.04
 #   webdevops/php-apache:ubuntu-15.04
 #   webdevops/php-apache:ubuntu-15.10
 #   webdevops/php-apache:ubuntu-16.04
-#   webdevops/php-apache:ubuntu-16.04-php7
 #   webdevops/php-apache:centos-7
 #   webdevops/php-apache:debian-7
 #   webdevops/php-apache:debian-8
 #   webdevops/php-apache:debian-8-php7
 #   webdevops/php-apache:debian-9
-#   webdevops/php-apache:debian-9-php7
 #
 # Nginx:
 #   webdevops/php-nginx:ubuntu-12.04
 #   webdevops/php-nginx:ubuntu-14.04
 #   webdevops/php-nginx:ubuntu-15.04
 #   webdevops/php-nginx:ubuntu-15.10
 #   webdevops/php-nginx:ubuntu-16.04
-#   webdevops/php-nginx:ubuntu-16.04-php7
 #   webdevops/php-nginx:centos-7
 #   webdevops/php-nginx:debian-7
 #   webdevops/php-nginx:debian-8
 #   webdevops/php-nginx:debian-8-php7
 #   webdevops/php-nginx:debian-9
-#   webdevops/php-nginx:debian-9-php7
 #
 # HHVM:
 #   webdevops/hhvm-apache
diff --git a/Dockerfile.development b/Dockerfile.development
@@ -7,39 +7,35 @@
 #  ubuntu-14.04 -> PHP 5.5         (trusty)   LTS
 #  ubuntu-15.04 -> PHP 5.6         (vivid)
 #  ubuntu-15.10 -> PHP 5.6         (wily)
-#  ubuntu-16.04 -> PHP 5.6 and 7.0 (xenial)   LTS
+#  ubuntu-16.04 -> PHP 7.0         (xenial)   LTS
 #  centos-7     -> PHP 5.4
 #  debian-7     -> PHP 5.4         (wheezy)
 #  debian-8     -> PHP 5.6 and 7.x (jessie)
-#  debian-9     -> PHP 5.6 and 7.0 (stretch)
+#  debian-9     -> PHP 7.0         (stretch)
 #
 # Apache:
 #   webdevops/php-apache-dev:ubuntu-12.04
 #   webdevops/php-apache-dev:ubuntu-14.04
 #   webdevops/php-apache-dev:ubuntu-15.04
 #   webdevops/php-apache-dev:ubuntu-15.10
 #   webdevops/php-apache-dev:ubuntu-16.04
-#   webdevops/php-apache-dev:ubuntu-16.04-php7
 #   webdevops/php-apache-dev:centos-7
 #   webdevops/php-apache-dev:debian-7
 #   webdevops/php-apache-dev:debian-8
 #   webdevops/php-apache-dev:debian-8-php7
 #   webdevops/php-apache-dev:debian-9
-#   webdevops/php-apache-dev:debian-9-php7
 #
 # Nginx:
 #   webdevops/php-nginx-dev-dev:ubuntu-12.04
 #   webdevops/php-nginx-dev-dev:ubuntu-14.04
 #   webdevops/php-nginx-dev-dev:ubuntu-15.04
 #   webdevops/php-nginx-dev-dev:ubuntu-15.10
 #   webdevops/php-nginx-dev-dev:ubuntu-16.04
-#   webdevops/php-nginx-dev-dev:ubuntu-16.04-php7
 #   webdevops/php-nginx-dev-dev:centos-7
 #   webdevops/php-nginx-dev-dev:debian-7
 #   webdevops/php-nginx-dev-dev:debian-8
 #   webdevops/php-nginx-dev-dev:debian-8-php7
 #   webdevops/php-nginx-dev-dev:debian-9
-#   webdevops/php-nginx-dev-dev:debian-9-php7
 #
 # HHVM:
 #   webdevops/hhvm-apache
diff --git a/Dockerfile.production b/Dockerfile.production
@@ -7,39 +7,35 @@
 #  ubuntu-14.04 -> PHP 5.5         (trusty)   LTS
 #  ubuntu-15.04 -> PHP 5.6         (vivid)
 #  ubuntu-15.10 -> PHP 5.6         (wily)
-#  ubuntu-16.04 -> PHP 5.6 and 7.0 (xenial)   LTS
+#  ubuntu-16.04 -> PHP 7.0         (xenial)   LTS
 #  centos-7     -> PHP 5.4
 #  debian-7     -> PHP 5.4         (wheezy)
 #  debian-8     -> PHP 5.6 and 7.x (jessie)
-#  debian-9     -> PHP 5.6 and 7.0 (stretch)
+#  debian-9     -> PHP 7.0         (stretch)
 #
 # Apache:
 #   webdevops/php-apache:ubuntu-12.04
 #   webdevops/php-apache:ubuntu-14.04
 #   webdevops/php-apache:ubuntu-15.04
 #   webdevops/php-apache:ubuntu-15.10
 #   webdevops/php-apache:ubuntu-16.04
-#   webdevops/php-apache:ubuntu-16.04-php7
 #   webdevops/php-apache:centos-7
 #   webdevops/php-apache:debian-7
 #   webdevops/php-apache:debian-8
 #   webdevops/php-apache:debian-8-php7
 #   webdevops/php-apache:debian-9
-#   webdevops/php-apache:debian-9-php7
 #
 # Nginx:
 #   webdevops/php-nginx:ubuntu-12.04
 #   webdevops/php-nginx:ubuntu-14.04
 #   webdevops/php-nginx:ubuntu-15.04
 #   webdevops/php-nginx:ubuntu-15.10
 #   webdevops/php-nginx:ubuntu-16.04
-#   webdevops/php-nginx:ubuntu-16.04-php7
 #   webdevops/php-nginx:centos-7
 #   webdevops/php-nginx:debian-7
 #   webdevops/php-nginx:debian-8
 #   webdevops/php-nginx:debian-8-php7
 #   webdevops/php-nginx:debian-9
-#   webdevops/php-nginx:debian-9-php7
 #
 # HHVM:
 #   webdevops/hhvm-apache
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Dockerized PHP web project boilerplate
 
-[![latest v5.1.0](https://img.shields.io/badge/latest-v5.1.0-green.svg?style=flat)](https://github.com/webdevops/php-docker-boilerplate/releases/tag/5.1.0)
+[![latest v5.1.1](https://img.shields.io/badge/latest-v5.1.1-green.svg?style=flat)](https://github.com/webdevops/php-docker-boilerplate/releases/tag/5.1.1)
 ![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")
diff --git a/provision/roles/boilerplate-main/templates/apache/vhost.conf.j2 b/provision/roles/boilerplate-main/templates/apache/vhost.conf.j2
@@ -12,7 +12,12 @@
 
   UseCanonicalName Off
 
-  Include /opt/docker/etc/httpd/vhost.common.conf
+  <IfVersion < 2.4>
+    Include /opt/docker/etc/httpd/vhost.common.d/*.conf
+  </IfVersion>
+  <IfVersion >= 2.4>
+    IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
+  </IfVersion>
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -21,7 +26,14 @@
   DocumentRoot "{{ vhost.documentRoot|default('<DOCUMENT_ROOT>') }}"
 
   UseCanonicalName Off
-  Include /opt/docker/etc/httpd/vhost.common.conf
+
+  <IfVersion < 2.4>
+    Include /opt/docker/etc/httpd/vhost.common.d/*.conf
+  </IfVersion>
+  <IfVersion >= 2.4>
+    IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
+  </IfVersion>
+
   Include /opt/docker/etc/httpd/vhost.ssl.conf
 </VirtualHost>
 
diff --git a/provision/roles/boilerplate-main/templates/nginx/vhost.conf.j2 b/provision/roles/boilerplate-main/templates/nginx/vhost.conf.j2
@@ -30,7 +30,7 @@ server {
         fastcgi_read_timeout 1000;
     }
 
-    include /opt/docker/etc/nginx/vhost.common.conf;
+    include /opt/docker/etc/nginx/vhost.common.d/*.conf;
 }
 
 ##############
@@ -62,7 +62,7 @@ server {
         fastcgi_read_timeout 1000;
     }
 
-    include /opt/docker/etc/nginx/vhost.common.conf;
+    include /opt/docker/etc/nginx/vhost.common.d/*.conf;
     include /opt/docker/etc/nginx/vhost.ssl.conf;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ server {`
`30`	`30`	`fastcgi_read_timeout 1000;`
`31`	`31`	`}`
`32`	`32`
`33`		`- include /opt/docker/etc/nginx/vhost.common.conf;`
	`33`	`+ include /opt/docker/etc/nginx/vhost.common.d/*.conf;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`##############`
`@@ -62,7 +62,7 @@ server {`
`62`	`62`	`fastcgi_read_timeout 1000;`
`63`	`63`	`}`
`64`	`64`
`65`		`- include /opt/docker/etc/nginx/vhost.common.conf;`
	`65`	`+ include /opt/docker/etc/nginx/vhost.common.d/*.conf;`
`66`	`66`	`include /opt/docker/etc/nginx/vhost.ssl.conf;`
`67`	`67`	`}`
`68`	`68`