diff --git a/CHANGELOG.md b/CHANGELOG.md index 030d46ea4..fb209cda5 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile index 2cd15d5d2..fdb70b3c8 100644 --- a/docker/ansible/alpine-3/Dockerfile +++ b/docker/ansible/alpine-3/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 1d562e9d2..3e2bb1076 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index 5ef747c92..5a0b2d9c6 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index aa526ca05..156dc58dd 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index 2ae22adc0..70211eadb 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index 94484a0ac..438d230b9 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index a33883b42..8934057b8 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index a0eb59e72..c7e08c8b6 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index 9a5ad1732..67a642bfb 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index 1401c83e9..56f0c1c8a 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine-3/Dockerfile index 010188da3..f1fead3ef 100644 --- a/docker/apache/alpine-3/Dockerfile +++ b/docker/apache/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io 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 diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index 67a82e370..6d3a667b1 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io 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 diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index cf2af6c50..9af5f7d78 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io 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 diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index f386bb6b4..2f08dc1be 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io 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 diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index ab01a968f..cba423f66 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io 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 diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index 4c4dc7982..9a87f5f2e 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index 8b833f5a3..667ebc000 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index 521efd1a8..ab87b6522 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index 4b52568f5..9a08a41ba 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io 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 diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 365c89be9..2ae2292a6 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine-3/Dockerfile index fc023737b..78e15dadb 100644 --- a/docker/base-app/alpine-3/Dockerfile +++ b/docker/base-app/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io 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 diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index 543af80e4..fcf5d16a2 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io 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 diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 02d8ae24a..06b07cd69 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io 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 diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index db60ad6ce..073d1940a 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io 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 diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index 5862b5ef7..823290ded 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io 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 diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index 8942adde1..44ae82d84 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index d917a93fc..1310ca755 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 97f278e48..e5959305d 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index 615e391e0..287abc3ff 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io 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 diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index f334bc413..eb57f6382 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index 9828e3e24..5a583d41d 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io 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/ diff --git a/docker/base/alpine-3/conf/bin/control.sh b/docker/base/alpine-3/conf/bin/control.sh index 96330b503..a6697092d 100644 --- a/docker/base/alpine-3/conf/bin/control.sh +++ b/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" ;; diff --git a/docker/base/alpine-3/conf/bin/provision.sh b/docker/base/alpine-3/conf/bin/provision.sh index e1be4f937..4079dd7f0 100644 --- a/docker/base/alpine-3/conf/bin/provision.sh +++ b/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 diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index a2440b520..0973d9805 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io 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/ diff --git a/docker/base/centos-7/conf/bin/control.sh b/docker/base/centos-7/conf/bin/control.sh index 96330b503..a6697092d 100644 --- a/docker/base/centos-7/conf/bin/control.sh +++ b/docker/base/centos-7/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" ;; diff --git a/docker/base/centos-7/conf/bin/provision.sh b/docker/base/centos-7/conf/bin/provision.sh index e1be4f937..4079dd7f0 100644 --- a/docker/base/centos-7/conf/bin/provision.sh +++ b/docker/base/centos-7/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 diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index eb3595f13..aee91540d 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io 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/ diff --git a/docker/base/debian-7/conf/bin/control.sh b/docker/base/debian-7/conf/bin/control.sh index 96330b503..a6697092d 100644 --- a/docker/base/debian-7/conf/bin/control.sh +++ b/docker/base/debian-7/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" ;; diff --git a/docker/base/debian-7/conf/bin/provision.sh b/docker/base/debian-7/conf/bin/provision.sh index e1be4f937..4079dd7f0 100644 --- a/docker/base/debian-7/conf/bin/provision.sh +++ b/docker/base/debian-7/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 diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index e22984e6f..ac6569f1d 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io 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/ diff --git a/docker/base/debian-8/conf/bin/control.sh b/docker/base/debian-8/conf/bin/control.sh index 96330b503..a6697092d 100644 --- a/docker/base/debian-8/conf/bin/control.sh +++ b/docker/base/debian-8/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" ;; diff --git a/docker/base/debian-8/conf/bin/provision.sh b/docker/base/debian-8/conf/bin/provision.sh index e1be4f937..4079dd7f0 100644 --- a/docker/base/debian-8/conf/bin/provision.sh +++ b/docker/base/debian-8/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 diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index d4aeb0e48..1b906d80f 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io 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/ diff --git a/docker/base/debian-9/conf/bin/control.sh b/docker/base/debian-9/conf/bin/control.sh index 96330b503..a6697092d 100644 --- a/docker/base/debian-9/conf/bin/control.sh +++ b/docker/base/debian-9/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" ;; diff --git a/docker/base/debian-9/conf/bin/provision.sh b/docker/base/debian-9/conf/bin/provision.sh index e1be4f937..4079dd7f0 100644 --- a/docker/base/debian-9/conf/bin/provision.sh +++ b/docker/base/debian-9/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 diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 4a72be07b..d031d92e1 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io 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/ diff --git a/docker/base/ubuntu-12.04/conf/bin/control.sh b/docker/base/ubuntu-12.04/conf/bin/control.sh index 96330b503..a6697092d 100644 --- a/docker/base/ubuntu-12.04/conf/bin/control.sh +++ b/docker/base/ubuntu-12.04/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" ;; diff --git a/docker/base/ubuntu-12.04/conf/bin/provision.sh b/docker/base/ubuntu-12.04/conf/bin/provision.sh index e1be4f937..4079dd7f0 100644 --- a/docker/base/ubuntu-12.04/conf/bin/provision.sh +++ b/docker/base/ubuntu-12.04/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 diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 63018782e..58e9e406c 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io 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/ diff --git a/docker/base/ubuntu-14.04/conf/bin/control.sh b/docker/base/ubuntu-14.04/conf/bin/control.sh index 96330b503..a6697092d 100644 --- a/docker/base/ubuntu-14.04/conf/bin/control.sh +++ b/docker/base/ubuntu-14.04/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" ;; diff --git a/docker/base/ubuntu-14.04/conf/bin/provision.sh b/docker/base/ubuntu-14.04/conf/bin/provision.sh index e1be4f937..4079dd7f0 100644 --- a/docker/base/ubuntu-14.04/conf/bin/provision.sh +++ b/docker/base/ubuntu-14.04/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 diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 4add3e806..33439f046 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io 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/ diff --git a/docker/base/ubuntu-15.04/conf/bin/control.sh b/docker/base/ubuntu-15.04/conf/bin/control.sh index 96330b503..a6697092d 100644 --- a/docker/base/ubuntu-15.04/conf/bin/control.sh +++ b/docker/base/ubuntu-15.04/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" ;; diff --git a/docker/base/ubuntu-15.04/conf/bin/provision.sh b/docker/base/ubuntu-15.04/conf/bin/provision.sh index e1be4f937..4079dd7f0 100644 --- a/docker/base/ubuntu-15.04/conf/bin/provision.sh +++ b/docker/base/ubuntu-15.04/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 diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 125153f44..43f5f3530 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io 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/ diff --git a/docker/base/ubuntu-15.10/conf/bin/control.sh b/docker/base/ubuntu-15.10/conf/bin/control.sh index 96330b503..a6697092d 100644 --- a/docker/base/ubuntu-15.10/conf/bin/control.sh +++ b/docker/base/ubuntu-15.10/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" ;; diff --git a/docker/base/ubuntu-15.10/conf/bin/provision.sh b/docker/base/ubuntu-15.10/conf/bin/provision.sh index e1be4f937..4079dd7f0 100644 --- a/docker/base/ubuntu-15.10/conf/bin/provision.sh +++ b/docker/base/ubuntu-15.10/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 diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 423c59cb0..dd799e3e3 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io 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/ diff --git a/docker/base/ubuntu-16.04/conf/bin/control.sh b/docker/base/ubuntu-16.04/conf/bin/control.sh index 96330b503..a6697092d 100644 --- a/docker/base/ubuntu-16.04/conf/bin/control.sh +++ b/docker/base/ubuntu-16.04/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" ;; diff --git a/docker/base/ubuntu-16.04/conf/bin/provision.sh b/docker/base/ubuntu-16.04/conf/bin/provision.sh index e1be4f937..4079dd7f0 100644 --- a/docker/base/ubuntu-16.04/conf/bin/provision.sh +++ b/docker/base/ubuntu-16.04/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 diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 8f573f3d0..f1a0ddf4c 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM alpine:3.3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/alpine-3/baselayout.tar b/docker/bootstrap/alpine-3/baselayout.tar index 15dec9066..c9a7d9e70 100644 Binary files a/docker/bootstrap/alpine-3/baselayout.tar and b/docker/bootstrap/alpine-3/baselayout.tar differ diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index e5e3bf321..4407c70ff 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM centos:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/centos-7/baselayout.tar b/docker/bootstrap/centos-7/baselayout.tar index 15dec9066..c9a7d9e70 100644 Binary files a/docker/bootstrap/centos-7/baselayout.tar and b/docker/bootstrap/centos-7/baselayout.tar differ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index fc3b4b242..68c041c29 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM debian:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-7/baselayout.tar b/docker/bootstrap/debian-7/baselayout.tar index 15dec9066..c9a7d9e70 100644 Binary files a/docker/bootstrap/debian-7/baselayout.tar and b/docker/bootstrap/debian-7/baselayout.tar differ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index fbc1b973b..3a6428732 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM debian:8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-8/baselayout.tar b/docker/bootstrap/debian-8/baselayout.tar index 15dec9066..c9a7d9e70 100644 Binary files a/docker/bootstrap/debian-8/baselayout.tar and b/docker/bootstrap/debian-8/baselayout.tar differ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 899389184..0f9a42b96 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM debian:stretch MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-9/baselayout.tar b/docker/bootstrap/debian-9/baselayout.tar index 15dec9066..c9a7d9e70 100644 Binary files a/docker/bootstrap/debian-9/baselayout.tar and b/docker/bootstrap/debian-9/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index aeabd1537..83d518859 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-12.04/baselayout.tar b/docker/bootstrap/ubuntu-12.04/baselayout.tar index 15dec9066..c9a7d9e70 100644 Binary files a/docker/bootstrap/ubuntu-12.04/baselayout.tar and b/docker/bootstrap/ubuntu-12.04/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index ee8b3d487..9a7ac887e 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-14.04/baselayout.tar b/docker/bootstrap/ubuntu-14.04/baselayout.tar index 15dec9066..c9a7d9e70 100644 Binary files a/docker/bootstrap/ubuntu-14.04/baselayout.tar and b/docker/bootstrap/ubuntu-14.04/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index bc7de6430..70a9e6492 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-15.04/baselayout.tar b/docker/bootstrap/ubuntu-15.04/baselayout.tar index 15dec9066..c9a7d9e70 100644 Binary files a/docker/bootstrap/ubuntu-15.04/baselayout.tar and b/docker/bootstrap/ubuntu-15.04/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 10a0dc5e2..73d5a6e8e 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-15.10/baselayout.tar b/docker/bootstrap/ubuntu-15.10/baselayout.tar index 15dec9066..c9a7d9e70 100644 Binary files a/docker/bootstrap/ubuntu-15.10/baselayout.tar and b/docker/bootstrap/ubuntu-15.10/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index f051ddde0..c7cb8ad12 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-16.04/baselayout.tar b/docker/bootstrap/ubuntu-16.04/baselayout.tar index 15dec9066..c9a7d9e70 100644 Binary files a/docker/bootstrap/ubuntu-16.04/baselayout.tar and b/docker/bootstrap/ubuntu-16.04/baselayout.tar differ diff --git a/docker/hhvm-apache/ubuntu-14.04/Dockerfile b/docker/hhvm-apache/ubuntu-14.04/Dockerfile index 27795ba07..3faac697c 100644 --- a/docker/hhvm-apache/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/hhvm-apache/ubuntu-16.04/Dockerfile b/docker/hhvm-apache/ubuntu-16.04/Dockerfile index 2226442c3..848aaf089 100644 --- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile index a95a0910d..87ddd8de5 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile index 31a79e975..fc38ee678 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/hhvm/ubuntu-14.04/Dockerfile b/docker/hhvm/ubuntu-14.04/Dockerfile index e13f4935a..9e175f589 100644 --- a/docker/hhvm/ubuntu-14.04/Dockerfile +++ b/docker/hhvm/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/hhvm/ubuntu-16.04/Dockerfile b/docker/hhvm/ubuntu-16.04/Dockerfile index 7e2b6b217..7a319fd69 100644 --- a/docker/hhvm/ubuntu-16.04/Dockerfile +++ b/docker/hhvm/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/mail-sandbox/ubuntu-14.04/Dockerfile b/docker/mail-sandbox/ubuntu-14.04/Dockerfile index 9ca493599..e5a78fdc7 100644 --- a/docker/mail-sandbox/ubuntu-14.04/Dockerfile +++ b/docker/mail-sandbox/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/postfix:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 ENV MAILBOX_USERNAME "sandbox" ENV MAILBOX_PASSWORD "mail" diff --git a/docker/nginx/alpine-3/Dockerfile b/docker/nginx/alpine-3/Dockerfile index 0583188da..ae5164b21 100644 --- a/docker/nginx/alpine-3/Dockerfile +++ b/docker/nginx/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io 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 diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index 41f119160..4fe7c6c2e 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io 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 diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index 043ce3cf9..576c3245c 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io 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 diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index cdd11ecbb..4f2309285 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io 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 diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index ad2858f92..debd10d52 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io 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 diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 3c826615c..4a42d9fb3 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index 2026c7732..af8931866 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index e8dd300a2..fbfb59c08 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 654042e76..2dc753507 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io 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 diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 27373ca73..11053625d 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-3-php7/Dockerfile index 5dc6e02e0..9b2447b68 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile +++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3-php7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache-dev/alpine-3/Dockerfile b/docker/php-apache-dev/alpine-3/Dockerfile index 85fbfa5ce..27686c3bd 100644 --- a/docker/php-apache-dev/alpine-3/Dockerfile +++ b/docker/php-apache-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index 7655a3cf8..d84c0d614 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index 6c74e7157..fe8ad6a9e 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index a8bb8aa1c..b06d1c4e3 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8-php7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index d2c5d2d94..8cd66b26c 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index 44afd97cc..ab926bc09 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index 93a9c419a..cd9b1ee3e 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-12.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index d6f59e53c..c6c92b3ed 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-14.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index 831867827..cb1bdbe80 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index 775de47b9..7bbc91429 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.10 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index 811960590..97ec367b8 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-16.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache/alpine-3-php7/Dockerfile b/docker/php-apache/alpine-3-php7/Dockerfile index 3ec95461b..a7aad13be 100644 --- a/docker/php-apache/alpine-3-php7/Dockerfile +++ b/docker/php-apache/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache/alpine-3/Dockerfile b/docker/php-apache/alpine-3/Dockerfile index 69846fa3c..5161a2577 100644 --- a/docker/php-apache/alpine-3/Dockerfile +++ b/docker/php-apache/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index bbd59ab40..7e1bdc996 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index 639a57b22..b0d21d8a6 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index 14828086c..f65adf85c 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index 3a53aaf46..9d3bf6b2a 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index ea5251d0c..b1d4b9a0d 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index c88e0d380..f2e5aabed 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index 839273b92..d2cee71cc 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index c35acda27..188ace4b3 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index 5f2986015..37fb34b44 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index 13e405a9f..a0aec0378 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-3-php7/Dockerfile index 06b89a121..0e9f2dfc0 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile +++ b/docker/php-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index ce1b6c7c3..ef29f2b7b 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 9b34b5632..4521aedd3 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index c97e73e42..f5645f5f5 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index 9e72f952e..2f5daa30b 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 963b02e7b..f45f4533e 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 791343df7..d170a39f5 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index ac03901f9..ae88ca218 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 660193a46..1738cc836 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index b0bb21dd4..7d3a83a2b 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 66339c285..56d923da7 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 3734d7480..d2af4b1d3 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile b/docker/php-nginx-dev/alpine-3-php7/Dockerfile index 652f80ba9..13b736b35 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile +++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3-php7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile b/docker/php-nginx-dev/alpine-3/Dockerfile index 608b4e388..6e7834d0c 100644 --- a/docker/php-nginx-dev/alpine-3/Dockerfile +++ b/docker/php-nginx-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index 27c16faf3..c9d808e0e 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index 518e90d9f..32191cdaf 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 59a9b9c5e..92ffd2786 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8-php7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index f24c93a9e..5b445b55a 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index e73cdbe71..e9b186b40 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index 2a40c5f89..39c3e932f 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-12.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index ce34d0dff..b3837e9d5 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-14.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 331071c6b..b6bf73d98 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index 4fc059694..1255382ab 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.10 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index c692f6544..56c6ddde9 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-16.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile b/docker/php-nginx/alpine-3-php7/Dockerfile index a7fdb2b0d..6b56163b3 100644 --- a/docker/php-nginx/alpine-3-php7/Dockerfile +++ b/docker/php-nginx/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx/alpine-3/Dockerfile b/docker/php-nginx/alpine-3/Dockerfile index 6aaa85fab..5229ed601 100644 --- a/docker/php-nginx/alpine-3/Dockerfile +++ b/docker/php-nginx/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index e61be4799..73a52d04d 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index 6a6f51908..bdb49e92e 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index f3a265b1a..a397b59a3 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index e6efc9dc6..5caadd8c5 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index 00703c538..90af1d1a4 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index a87c2bcf5..5ad18831a 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index cc678b061..97581ae69 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index 33ecb4f69..8e66e3a0a 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index a33f110eb..58798da2b 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io 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 diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index 1c5b59d58..cccb85f8e 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile index 1ca364270..0f441aecb 100644 --- a/docker/php/alpine-3-php7/Dockerfile +++ b/docker/php/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io 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 diff --git a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.sh b/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.sh index 53b7a6be1..571f248d2 100644 --- a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.sh +++ b/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.sh @@ -2,6 +2,6 @@ source /opt/docker/bin/config.sh -includeScriptDir "/opt/docker/bin/service.d/php.d/" +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" exec /usr/sbin/php-fpm --nodaemonize diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile index 5cb03aa49..db73f56ed 100644 --- a/docker/php/alpine-3/Dockerfile +++ b/docker/php/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io 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 diff --git a/docker/php/alpine-3/conf/bin/service.d/php-fpm.sh b/docker/php/alpine-3/conf/bin/service.d/php-fpm.sh index 53b7a6be1..571f248d2 100644 --- a/docker/php/alpine-3/conf/bin/service.d/php-fpm.sh +++ b/docker/php/alpine-3/conf/bin/service.d/php-fpm.sh @@ -2,6 +2,6 @@ source /opt/docker/bin/config.sh -includeScriptDir "/opt/docker/bin/service.d/php.d/" +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" exec /usr/sbin/php-fpm --nodaemonize diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index e59dc3ad1..d96224ccf 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php/centos-7/conf/bin/service.d/php-fpm.sh b/docker/php/centos-7/conf/bin/service.d/php-fpm.sh index 53b7a6be1..571f248d2 100644 --- a/docker/php/centos-7/conf/bin/service.d/php-fpm.sh +++ b/docker/php/centos-7/conf/bin/service.d/php-fpm.sh @@ -2,6 +2,6 @@ source /opt/docker/bin/config.sh -includeScriptDir "/opt/docker/bin/service.d/php.d/" +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" exec /usr/sbin/php-fpm --nodaemonize diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index e52d5550b..7ce1b2826 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-7 MAINTAINER info@webdevops.io 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 diff --git a/docker/php/debian-7/conf/bin/service.d/php-fpm.sh b/docker/php/debian-7/conf/bin/service.d/php-fpm.sh index 53b7a6be1..571f248d2 100644 --- a/docker/php/debian-7/conf/bin/service.d/php-fpm.sh +++ b/docker/php/debian-7/conf/bin/service.d/php-fpm.sh @@ -2,6 +2,6 @@ source /opt/docker/bin/config.sh -includeScriptDir "/opt/docker/bin/service.d/php.d/" +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" exec /usr/sbin/php-fpm --nodaemonize diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 2d7de2ef3..c92aade6a 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io 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 diff --git a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.sh b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.sh index 53b7a6be1..571f248d2 100644 --- a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.sh +++ b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.sh @@ -2,6 +2,6 @@ source /opt/docker/bin/config.sh -includeScriptDir "/opt/docker/bin/service.d/php.d/" +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" exec /usr/sbin/php-fpm --nodaemonize diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 3af49f116..6f6cafef7 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io 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 diff --git a/docker/php/debian-8/conf/bin/service.d/php-fpm.sh b/docker/php/debian-8/conf/bin/service.d/php-fpm.sh index 53b7a6be1..571f248d2 100644 --- a/docker/php/debian-8/conf/bin/service.d/php-fpm.sh +++ b/docker/php/debian-8/conf/bin/service.d/php-fpm.sh @@ -2,6 +2,6 @@ source /opt/docker/bin/config.sh -includeScriptDir "/opt/docker/bin/service.d/php.d/" +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" exec /usr/sbin/php-fpm --nodaemonize diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index b9171ad24..f39f48698 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-9 MAINTAINER info@webdevops.io 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 diff --git a/docker/php/debian-9/conf/bin/service.d/php-fpm.sh b/docker/php/debian-9/conf/bin/service.d/php-fpm.sh index 53b7a6be1..571f248d2 100644 --- a/docker/php/debian-9/conf/bin/service.d/php-fpm.sh +++ b/docker/php/debian-9/conf/bin/service.d/php-fpm.sh @@ -2,6 +2,6 @@ source /opt/docker/bin/config.sh -includeScriptDir "/opt/docker/bin/service.d/php.d/" +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" exec /usr/sbin/php-fpm --nodaemonize diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index 64f104943..62a2e9050 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-12.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.sh index 83cf8a5f3..1653587a5 100644 --- a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.sh +++ b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.sh @@ -2,6 +2,6 @@ source /opt/docker/bin/config.sh -includeScriptDir "/opt/docker/bin/service.d/php.d/" +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" exec /usr/sbin/php5-fpm diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 8a8abbd54..b8106b936 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.sh index 53b7a6be1..571f248d2 100644 --- a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.sh +++ b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.sh @@ -2,6 +2,6 @@ source /opt/docker/bin/config.sh -includeScriptDir "/opt/docker/bin/service.d/php.d/" +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" exec /usr/sbin/php-fpm --nodaemonize diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index 9ccf74ed0..330fcdc73 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.sh index 53b7a6be1..571f248d2 100644 --- a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.sh +++ b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.sh @@ -2,6 +2,6 @@ source /opt/docker/bin/config.sh -includeScriptDir "/opt/docker/bin/service.d/php.d/" +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" exec /usr/sbin/php-fpm --nodaemonize diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index ba5211a70..16caea36b 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.10 MAINTAINER info@webdevops.io 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 diff --git a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.sh index 53b7a6be1..571f248d2 100644 --- a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.sh +++ b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.sh @@ -2,6 +2,6 @@ source /opt/docker/bin/config.sh -includeScriptDir "/opt/docker/bin/service.d/php.d/" +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" exec /usr/sbin/php-fpm --nodaemonize diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index 6a1bd3056..c1cd46918 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04 MAINTAINER info@webdevops.io 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 diff --git a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.sh index 53b7a6be1..571f248d2 100644 --- a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.sh +++ b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.sh @@ -2,6 +2,6 @@ source /opt/docker/bin/config.sh -includeScriptDir "/opt/docker/bin/service.d/php.d/" +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" exec /usr/sbin/php-fpm --nodaemonize diff --git a/docker/piwik/ubuntu-14.04/Dockerfile b/docker/piwik/ubuntu-14.04/Dockerfile index 5fa581d16..60bf9c95a 100644 --- a/docker/piwik/ubuntu-14.04/Dockerfile +++ b/docker/piwik/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-nginx:ubuntu-14.04 MAINTAINER info@webdevops.io 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/piwik/ ENV PIWIK_URL http://example.com/ diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile index 7891ab1a5..c83e708df 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index fb9c92123..175b27a89 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -8,7 +8,7 @@ FROM zendesk/samson:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 ############################################################################### diff --git a/docker/samson-deployment/latest/baselayout.tar b/docker/samson-deployment/latest/baselayout.tar index 15dec9066..c9a7d9e70 100644 Binary files a/docker/samson-deployment/latest/baselayout.tar and b/docker/samson-deployment/latest/baselayout.tar differ diff --git a/docker/samson-deployment/latest/conf/bin/control.sh b/docker/samson-deployment/latest/conf/bin/control.sh index 96330b503..a6697092d 100644 --- a/docker/samson-deployment/latest/conf/bin/control.sh +++ b/docker/samson-deployment/latest/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" ;; diff --git a/docker/samson-deployment/latest/conf/bin/provision.sh b/docker/samson-deployment/latest/conf/bin/provision.sh index e1be4f937..4079dd7f0 100644 --- a/docker/samson-deployment/latest/conf/bin/provision.sh +++ b/docker/samson-deployment/latest/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 diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index 5bf2b9410..c5d75a33b 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 RUN /usr/local/bin/apk-install \ # General sphinx diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 0e50790c5..fbedc7302 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 RUN /opt/docker/bin/control.sh service.enable ssh diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index 0e60b456e..d27712751 100644 --- a/docker/storage/latest/Dockerfile +++ b/docker/storage/latest/Dockerfile @@ -8,7 +8,7 @@ FROM busybox:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 RUN mkdir /storage/ \ && chmod 777 /storage/ diff --git a/docker/typo3/ubuntu-14.04/Dockerfile b/docker/typo3/ubuntu-14.04/Dockerfile index 90f6a3c8f..f17f5b259 100644 --- a/docker/typo3/ubuntu-14.04/Dockerfile +++ b/docker/typo3/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-apache:ubuntu-14.04 MAINTAINER info@webdevops.io 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/web/ diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index 7a6c80a49..64a55f12a 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 ENV VARNISH_PORT 80 diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index 1d372b1ec..2e52e369a 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 ENV FTP_USER application ENV FTP_PASSWORD application diff --git a/documentation/docs/content/DockerfilesBuildingProcess/building.rst b/documentation/docs/content/BuildingProcess/building.rst similarity index 100% rename from documentation/docs/content/DockerfilesBuildingProcess/building.rst rename to documentation/docs/content/BuildingProcess/building.rst diff --git a/documentation/docs/content/DockerfilesBuildingProcess/customizing.rst b/documentation/docs/content/BuildingProcess/customizing.rst similarity index 100% rename from documentation/docs/content/DockerfilesBuildingProcess/customizing.rst rename to documentation/docs/content/BuildingProcess/customizing.rst diff --git a/documentation/docs/content/DockerfilesBuildingProcess/index.rst b/documentation/docs/content/BuildingProcess/index.rst similarity index 100% rename from documentation/docs/content/DockerfilesBuildingProcess/index.rst rename to documentation/docs/content/BuildingProcess/index.rst diff --git a/documentation/docs/content/DockerfilesBuildingProcess/testing.rst b/documentation/docs/content/BuildingProcess/testing.rst similarity index 100% rename from documentation/docs/content/DockerfilesBuildingProcess/testing.rst rename to documentation/docs/content/BuildingProcess/testing.rst diff --git a/documentation/docs/content/Customization/index.rst b/documentation/docs/content/Customization/index.rst new file mode 100644 index 000000000..f6f21a7a7 --- /dev/null +++ b/documentation/docs/content/Customization/index.rst @@ -0,0 +1,12 @@ +============= +Customization +============= + +This section is not done yet! + + +.. toctree:: + :maxdepth: 1 + + provisioning + supervisord diff --git a/documentation/docs/content/Customization/provisioning.rst b/documentation/docs/content/Customization/provisioning.rst new file mode 100644 index 000000000..a4a4610b3 --- /dev/null +++ b/documentation/docs/content/Customization/provisioning.rst @@ -0,0 +1,69 @@ +============ +Provisioning +============ + +.. important:: Provision system is only available in Docker images which are based on ``webdevops/base``! + +Provision Events +---------------- + +==================================================== ================================================================== +Provision event/tag Description +---------------------------------------------------- ------------------------------------------------------------------ +``bootstrap`` Run on Docker image creation (only run once) +``build`` Run on Docker image build +``onbuild`` Run on Docker image ONBUILD +``entrypoint`` Run on Docker image entrypoint execution + (only here Environment variables are available) +==================================================== ================================================================== + +.. attention:: Try to avoid entrypoint provision tasks because it delays startup time. + +Shell script provision +---------------------- + +For each provision event there is a directory for shell scripts: + +- ``/opt/docker/provision/bootstrap.d/`` +- ``/opt/docker/provision/build.d/`` +- ``/opt/docker/provision/onbuild.d/`` +- ``/opt/docker/provision/entrypoint.d/`` + +For customization just add your shell scripts into these directories for the simple shell script provision system. + + +Ansible provision +----------------- + +For Ansible the provision events are available as tags. The roles are located inside ``/opt/docker/provision/roles/`` +and must be registred with the provision system: + +.. code-block:: bash + + /opt/docker/bin/provision add --tag bootstrap my-own-role + + +Multiple tags can be defined with multiple ``--tag`` options: + +.. code-block:: bash + + /opt/docker/bin/provision add --tag bootstrap --tag build my-own-role + +There is a pritory system for roles in which order they should be executed, default priority is 100: + +.. code-block:: bash + + ## run before + /opt/docker/bin/provision add --tag bootstrap --priority 40 my-own-role-first + + ## run with normal priority + /opt/docker/bin/provision add --tag bootstrap my-own-role + + ## run after + /opt/docker/bin/provision add --tag bootstrap --priority 200 my-own-role-last + +It's also possible to run one role with the provision command: + +.. code-block:: bash + + /opt/docker/bin/provision run --tag bootstrap my-own-role diff --git a/documentation/docs/content/Customization/supervisord.rst b/documentation/docs/content/Customization/supervisord.rst new file mode 100644 index 000000000..41034830f --- /dev/null +++ b/documentation/docs/content/Customization/supervisord.rst @@ -0,0 +1,48 @@ +================= +Supervisor Daemon +================= + +.. important:: Supervisor is only available in Docker images which are based on ``webdevops/base``! + +Introduction +------------ + +Supervisor daemon is used to start and supervise more than one process in Docker containers. More about supervisor can +be found on supervisor homepage at http://supervisord.org/ + +Configuration +------------- + +The main supervisor configuration file is located at ``/opt/docker/etc/supervisor.conf`` and only controls the +supervisor daemon itself. All services are configured inside ``/opt/docker/etc/supervisor.d/`` directory. + +Example configuration for hhvm:: + + [group:hhvm] + programs=hhvmd + priority=20 + + [program:hhvmd] + command = /opt/docker/bin/service.d/hhvm.sh + process_name=%(program_name)s + directory = /var/run/hhvm/ + user = application + startsecs = 0 + autostart = true + autorestart = true + stdout_logfile=/dev/stdout + stdout_logfile_maxbytes=0 + stderr_logfile=/dev/stderr + stderr_logfile_maxbytes=0 + +Service daemon scripts +---------------------- + +For every service there is a small bash script inside ``/opt/docker/bin/service.d/`` which takes care how to start the +service. This script also have a modular task runner which runs files from ``/opt/docker/bin/service.d/SERVICE.d/*.sh``. + +Example for HHVM: + + HHVM's service script is located at ``/opt/docker/bin/service.d/hhvm.sh``. + + Before running HHVM all scripts found with ``/opt/docker/bin/service.d/hhvm.d/*.sh`` will be executed. diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/ansible.rst b/documentation/docs/content/DockerImages/dockerfiles/ansible.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/ansible.rst rename to documentation/docs/content/DockerImages/dockerfiles/ansible.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/apache.rst b/documentation/docs/content/DockerImages/dockerfiles/apache.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/apache.rst rename to documentation/docs/content/DockerImages/dockerfiles/apache.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/base-app.rst b/documentation/docs/content/DockerImages/dockerfiles/base-app.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/base-app.rst rename to documentation/docs/content/DockerImages/dockerfiles/base-app.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/base.rst b/documentation/docs/content/DockerImages/dockerfiles/base.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/base.rst rename to documentation/docs/content/DockerImages/dockerfiles/base.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/bootstrap.rst b/documentation/docs/content/DockerImages/dockerfiles/bootstrap.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/bootstrap.rst rename to documentation/docs/content/DockerImages/dockerfiles/bootstrap.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/hhvm-apache.rst b/documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/hhvm-apache.rst rename to documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/hhvm-nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/hhvm-nginx.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/hhvm-nginx.rst rename to documentation/docs/content/DockerImages/dockerfiles/hhvm-nginx.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/hhvm.rst b/documentation/docs/content/DockerImages/dockerfiles/hhvm.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/hhvm.rst rename to documentation/docs/content/DockerImages/dockerfiles/hhvm.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/include/environment-web.rst b/documentation/docs/content/DockerImages/dockerfiles/include/environment-web.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/include/environment-web.rst rename to documentation/docs/content/DockerImages/dockerfiles/include/environment-web.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/include/image-tag-hhvm.rst b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-hhvm.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/include/image-tag-hhvm.rst rename to documentation/docs/content/DockerImages/dockerfiles/include/image-tag-hhvm.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/include/image-tag-php.rst b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/include/image-tag-php.rst rename to documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/include/info-php-development.rst b/documentation/docs/content/DockerImages/dockerfiles/include/info-php-development.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/include/info-php-development.rst rename to documentation/docs/content/DockerImages/dockerfiles/include/info-php-development.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/include/info-php-production.rst b/documentation/docs/content/DockerImages/dockerfiles/include/info-php-production.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/include/info-php-production.rst rename to documentation/docs/content/DockerImages/dockerfiles/include/info-php-production.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/mail-catcher.rst b/documentation/docs/content/DockerImages/dockerfiles/mail-catcher.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/mail-catcher.rst rename to documentation/docs/content/DockerImages/dockerfiles/mail-catcher.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/nginx.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/nginx.rst rename to documentation/docs/content/DockerImages/dockerfiles/nginx.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/php-apache-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/php-apache-dev.rst rename to documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/php-apache.rst b/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/php-apache.rst rename to documentation/docs/content/DockerImages/dockerfiles/php-apache.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/php-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/php-dev.rst rename to documentation/docs/content/DockerImages/dockerfiles/php-dev.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/php-nginx-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/php-nginx-dev.rst rename to documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/php-nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/php-nginx.rst rename to documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/php.rst b/documentation/docs/content/DockerImages/dockerfiles/php.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/php.rst rename to documentation/docs/content/DockerImages/dockerfiles/php.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/postfix.rst b/documentation/docs/content/DockerImages/dockerfiles/postfix.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/postfix.rst rename to documentation/docs/content/DockerImages/dockerfiles/postfix.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/samson-deployment.rst b/documentation/docs/content/DockerImages/dockerfiles/samson-deployment.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/samson-deployment.rst rename to documentation/docs/content/DockerImages/dockerfiles/samson-deployment.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/sphinx.rst b/documentation/docs/content/DockerImages/dockerfiles/sphinx.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/sphinx.rst rename to documentation/docs/content/DockerImages/dockerfiles/sphinx.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/ssh.rst b/documentation/docs/content/DockerImages/dockerfiles/ssh.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/ssh.rst rename to documentation/docs/content/DockerImages/dockerfiles/ssh.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/varnish.rst b/documentation/docs/content/DockerImages/dockerfiles/varnish.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/varnish.rst rename to documentation/docs/content/DockerImages/dockerfiles/varnish.rst diff --git a/documentation/docs/content/DockerfilesUsage/dockerfiles/vsftp.rst b/documentation/docs/content/DockerImages/dockerfiles/vsftp.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/dockerfiles/vsftp.rst rename to documentation/docs/content/DockerImages/dockerfiles/vsftp.rst diff --git a/documentation/docs/content/DockerfilesUsage/index.rst b/documentation/docs/content/DockerImages/index.rst similarity index 100% rename from documentation/docs/content/DockerfilesUsage/index.rst rename to documentation/docs/content/DockerImages/index.rst diff --git a/documentation/docs/index.rst b/documentation/docs/index.rst index 121fb16f4..91f71e35b 100644 --- a/documentation/docs/index.rst +++ b/documentation/docs/index.rst @@ -25,5 +25,6 @@ Overview :caption: Documentation :maxdepth: 2 - content/DockerfilesUsage/index - content/DockerfilesBuildingProcess/index + content/DockerImages/index + content/Customization/index + content/BuildingProcess/index diff --git a/provisioning/base/general/bin/control.sh b/provisioning/base/general/bin/control.sh index 96330b503..a6697092d 100644 --- a/provisioning/base/general/bin/control.sh +++ b/provisioning/base/general/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" ;; diff --git a/provisioning/base/general/bin/provision.sh b/provisioning/base/general/bin/provision.sh index e1be4f937..4079dd7f0 100644 --- a/provisioning/base/general/bin/provision.sh +++ b/provisioning/base/general/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 diff --git a/provisioning/php/general/bin/service.d/php-fpm.sh b/provisioning/php/general/bin/service.d/php-fpm.sh index 53b7a6be1..571f248d2 100644 --- a/provisioning/php/general/bin/service.d/php-fpm.sh +++ b/provisioning/php/general/bin/service.d/php-fpm.sh @@ -2,6 +2,6 @@ source /opt/docker/bin/config.sh -includeScriptDir "/opt/docker/bin/service.d/php.d/" +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" exec /usr/sbin/php-fpm --nodaemonize diff --git a/provisioning/php/ubuntu-12.04/bin/service.d/php-fpm.sh b/provisioning/php/ubuntu-12.04/bin/service.d/php-fpm.sh index 83cf8a5f3..1653587a5 100644 --- a/provisioning/php/ubuntu-12.04/bin/service.d/php-fpm.sh +++ b/provisioning/php/ubuntu-12.04/bin/service.d/php-fpm.sh @@ -2,6 +2,6 @@ source /opt/docker/bin/config.sh -includeScriptDir "/opt/docker/bin/service.d/php.d/" +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" exec /usr/sbin/php5-fpm diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index 77fb6de4f..7dfdfb317 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -10,7 +10,7 @@ FROM {{ image }}:{{ tag }} MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.0 +LABEL io.webdevops.version=0.50.2 {%- endmacro %} {% macro environmentLang() -%}