Merge branch 'release/0.50.2'

CHANGELOG.md

@@ -4,6 +4,10 @@ This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/D
 
 ## [1.0.0] - upcoming
 
+## [0.50.2] - 2016-05-27
+### Changed
+- Fix /opt/docker/bin/service.d/php-fpm.sh using php.d instead of php-fpm.d
+- Restructured documentation, Added customization section
 
 ## [0.50.1] - 2016-05-24
 ### Changed

docker/ansible/alpine-3/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2

docker/ansible/centos-7/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2

docker/ansible/debian-7/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2

docker/ansible/debian-8/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2

docker/ansible/debian-9/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2

docker/ansible/ubuntu-12.04/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2

docker/ansible/ubuntu-14.04/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2

docker/ansible/ubuntu-15.04/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2

docker/ansible/ubuntu-15.10/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2

docker/ansible/ubuntu-16.04/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2

docker/apache/alpine-3/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/centos-7/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/debian-7/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/debian-8/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/debian-9/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/ubuntu-12.04/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/ubuntu-14.04/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/ubuntu-15.04/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/ubuntu-15.10/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/ubuntu-16.04/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/base-app/alpine-3/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

docker/base-app/centos-7/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

docker/base-app/debian-7/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

docker/base-app/debian-8/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

docker/base-app/debian-9/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

docker/base-app/ubuntu-12.04/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

docker/base-app/ubuntu-14.04/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

docker/base-app/ubuntu-15.04/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

docker/base-app/ubuntu-15.10/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

docker/base-app/ubuntu-16.04/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

docker/base/alpine-3/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV DOCKER_CONF_HOME /opt/docker/
 

docker/base/alpine-3/conf/bin/control.sh

@@ -20,79 +20,79 @@ case "$CONTROL_COMMAND" in
 
     ## main roles
     "provision.role")
-        deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles"
+        deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles"
         /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1"
         ;;
 
     "provision.role.bootstrap")
-        deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag bootstrap [role]<< for adding provision roles"
+        deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles"
         /opt/docker/bin/provision add --tag bootstrap "$1"
         ;;
 
     "provision.role.build")
-        deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag build [role]<< for adding provision roles"
+        deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles"
         /opt/docker/bin/provision add --tag build "$1"
         ;;
 
     "provision.role.onbuild")
-        deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag onbuild [role]<< for adding provision roles"
+        deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles"
         /opt/docker/bin/provision add --tag onbuild "$1"
         ;;
 
     "provision.role.entrypoint")
-        deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag entrypoint [role]<< for adding provision roles"
+        deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles"
         /opt/docker/bin/provision add --tag entrypoint "$1"
         ;;
 
     ## startup roles
     "provision.role.startup")
-        deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles"
+        deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles"
         /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint  --priority 50 "$1"
         ;;
 
     "provision.role.startup.bootstrap")
-        deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag bootstrap --priority 50 [role]<< for adding provision roles"
+        deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles"
         /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1"
         ;;
 
     "provision.role.startup.build")
-        deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag build --priority 50 [role]<< for adding provision roles"
+        deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles"
         /opt/docker/bin/provision add --tag build --priority 50 "$1"
         ;;
 
     "provision.role.startup.onbuild")
-        deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag onbuild --priority 50 [role]<< for adding provision roles"
+        deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles"
         /opt/docker/bin/provision add --tag onbuild --priority 50 "$1"
         ;;
 
     "provision.role.startup.entrypoint")
-        deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag entrypoint --priority 50 [role]<< for adding provision roles"
+        deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles"
         /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1"
         ;;
 
     ## finish roles
     "provision.role.finish")
-        deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles"
+        deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles"
         /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint  --priority 200 "$1"
         ;;
 
     "provision.role.finish.bootstrap")
-        deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag bootstrap --priority 200 [role]<< for adding provision roles"
+        deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles"
         /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1"
         ;;
 
     "provision.role.finish.build")
-        deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag build --priority 200 [role]<< for adding provision roles"
+        deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles"
         /opt/docker/bin/provision add --tag build --priority 200 "$1"
         ;;
 
     "provision.role.finish.onbuild")
-        deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag onbuild --priority 200 [role]<< for adding provision roles"
+        deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles"
         /opt/docker/bin/provision add --tag onbuild --priority 200 "$1"
         ;;
 
     "provision.role.finish.entrypoint")
-        deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag entrypoint --priority 200 [role]<< for adding provision roles"
+        deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles"
         /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1"
         ;;
 

docker/base/alpine-3/conf/bin/provision.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+	#!/usr/bin/env bash
 
 #
 # Example:
@@ -13,7 +13,7 @@ set -o errexit   ## set -e : exit the script if any statement returns a non-true
 
 . config.sh
 
-deprecationNotice " Please use >>/opt/docker/bin/proviation run --playbook playbook.yml --tag=bootstrap [args]<< for running provision"
+deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision"
 
 
 if [ "$#" -lt 2 ]; then

docker/base/centos-7/Dockerfile

@@ -8,7 +8,7 @@ FROM webdevops/bootstrap:centos-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.50.0
+LABEL io.webdevops.version=0.50.2
 
 ENV DOCKER_CONF_HOME /opt/docker/