Merge branch 'release/5.2.0-beta1'

Author: mblaschke

Diff for: CHANGELOG.md

@@ -1,6 +1,17 @@
 PHP Docker Boilerplate Changelog
 ==================================
 
+5.2.0-beta1 - 2016-10-18
+------------------------
+- Add dinghy/dory support
+- Switch to mailhog instead of mailcatcher
+- Add phpmyadmin
+- Switch to ubuntu 16.04 as default
+- docker-compose.yml is now using version 2
+- PHP debugger can now be switched with variable
+- Add PostgreSQL 9.5
+- Some minor fixes and cleanups
+
 5.1.3 - 2016-05-25
 ------------------
 - Fix nginx vhost configuration (modular WebDevOps image design)

Diff for: Dockerfile.cloud

@@ -43,7 +43,7 @@
 #
 #++++++++++++++++++++++++++++++++++++++
 
-FROM webdevops/php-apache:ubuntu-14.04
+FROM webdevops/php-apache:ubuntu-16.04
 
 ENV PROVISION_CONTEXT "production"
 
@@ -53,7 +53,7 @@ COPY provision/       /opt/docker/provision/
 
 COPY app/             /app/
 
-RUN /opt/docker/bin/provision add --tag bootstrap --tag entrypoint boilerplate-main boilerplate-deployment \
+RUN /opt/docker/bin/provision run --tag bootstrap --role boilerplate-main --role boilerplate-deployment \
     && /opt/docker/bin/bootstrap.sh
 
 # Configure volume/workdir