diff --git a/CHANGELOG.md b/CHANGELOG.md index 326e081e9..7ebbefc94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/D ## [1.0.0] - upcoming +## [0.53.1] - 2016-06-27 +- Fixed and improved `PHP_DEBUGGER` for php-dev + ## [0.53.0] - 2016-06-23 - Added apache-dev and nginx-dev - Restructed php-*dev provision diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile index 60e832753..ceba2ecb0 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 6e0b42c4c..792ff47d9 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index ca797b19e..b11ac9107 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index f9af8c944..6594e2eb2 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index 6153e7fc3..bf3be8638 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index 1a81117cf..98b5b2274 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index 418d3ef28..43d01f3c3 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index 205a37cfb..495417873 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index bd68a6feb..f7ade4603 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index ea2e82bf7..e7984cb6b 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 diff --git a/docker/apache-dev/alpine-3/Dockerfile b/docker/apache-dev/alpine-3/Dockerfile index 97f7a1a07..dac4260f8 100644 --- a/docker/apache-dev/alpine-3/Dockerfile +++ b/docker/apache-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index 1bb965226..285b968bc 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index a93fa0d4f..a21c89f56 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index bb9af5d5a..f4e65a38f 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index 9bd49d309..430ebca4e 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index db0754375..d3be4e34b 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index 45b0d4601..02ac0276b 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index a722fdeda..b419e1755 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index 216172f4f..31f8de1c7 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index 592bbc7e1..e2317eb44 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine-3/Dockerfile index f1bb9cd4e..6210d6560 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 e012ac6b4..526782174 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 d5c13fb47..02b32f8f1 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 a5ae5d5e9..22f965d31 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 507ed9aa3..77ae527e7 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 b19989a7d..fd7c989bd 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 fbdabbbeb..9118aab51 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 991794957..826e48ba4 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 2fab8495f..c1e41c924 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 b2fe284ea..e6905e186 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 23d870ff2..1bd56e2be 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 bfe1a4f94..cfb7f9039 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 357ee82f1..573e6be10 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 22e741588..a60c96284 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 757bf3960..cce6edcb0 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 5d548bf8a..bdc03ac24 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 6e5e92733..a6a0fd2d1 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 009ef4ba5..30623b2ff 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 fd741083c..d0664d8ee 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 36fe35604..37b64fcf1 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index 1eb43e044..e0fc947d6 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index ab0cc0255..3c05988c7 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index c3c164a8c..32f5b0195 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 54d717676..dc3735446 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 5feba82f2..950816d9a 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 31b10a0e5..440b63876 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index f8c7e6c87..0d5e6cef7 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index c58a11192..a05c6ef7a 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 1e686c680..ac8b263dd 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 5e3ac78c8..acd6dded6 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 1b1283342..e2238f81f 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -45,7 +45,7 @@ RUN set -x \ py-paramiko \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible pysed \ + && pip install ansible \ && chmod 750 /usr/bin/ansible* \ # Cleanup && apk del python-dev diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 11a78d6bd..08522d25f 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -38,7 +38,7 @@ RUN set -x \ && easy_install pip \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible pysed \ + && pip install ansible \ && chmod 750 /usr/bin/ansible* \ && yum erase -y python-devel \ && yum clean all diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 1cbf0ae7a..6c7eecece 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -47,7 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible pysed \ + && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 7ecde3dcb..a1e6a6bdd 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -47,7 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible pysed \ + && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 028563795..805bf2161 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -47,7 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible pysed \ + && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 8bf4811e5..48b85b60f 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -48,7 +48,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ apt-transport-https \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible pysed \ + && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 84b05a297..81147b154 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -46,7 +46,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible pysed \ + && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 7377826e8..02f7c16f4 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -46,7 +46,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible pysed \ + && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index d24a0c26d..6b10a6b43 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -46,7 +46,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible pysed \ + && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index ff464ce88..279c5582e 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -46,7 +46,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible pysed \ + && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/hhvm-apache/ubuntu-14.04/Dockerfile b/docker/hhvm-apache/ubuntu-14.04/Dockerfile index 72af9a209..a3eb710e0 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 966ae3c17..c2ae43121 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 0c2da55a9..69d72125e 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 4d427e506..ea868c30a 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 79db787ad..087916fa5 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 45c0a55a3..e9749227d 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index 80806aeca..4b018863c 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/postfix:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV MAILBOX_USERNAME "sandbox" ENV MAILBOX_PASSWORD "mail" diff --git a/docker/nginx-dev/alpine-3/Dockerfile b/docker/nginx-dev/alpine-3/Dockerfile index 5eafaf5ef..61bc841e7 100644 --- a/docker/nginx-dev/alpine-3/Dockerfile +++ b/docker/nginx-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile index 0e92082dd..94c1fc8e8 100644 --- a/docker/nginx-dev/centos-7/Dockerfile +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile index 24066d52f..f422c99f4 100644 --- a/docker/nginx-dev/debian-7/Dockerfile +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile index 550862f32..e32e7ceae 100644 --- a/docker/nginx-dev/debian-8/Dockerfile +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile index 3efd710d8..b19a8c4f5 100644 --- a/docker/nginx-dev/debian-9/Dockerfile +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile index ba5c9ee12..23bca57a1 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile index d9511ad31..3cf506bda 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile index 5af8c5d13..22187d030 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile index 1eadb84d2..a2cc39d57 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile index dd007ce52..66c2c6b48 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/alpine-3/Dockerfile b/docker/nginx/alpine-3/Dockerfile index 8fada7311..c954c2588 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 b0473fd19..719fd8a01 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 5f06dae44..a2b8db0b0 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 ca48146d3..6c1a1e98a 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 1b05692bc..796e7340c 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 dac849bed..a9a6adf8d 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 cd5e78091..ec7624a47 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 3f11a092e..2dc6477c6 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 75aa03b48..b22933298 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 0e9617efb..afd407a4e 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/README.md b/docker/php-apache-dev/README.md index 876f6ad1c..5fbe3082d 100644 --- a/docker/php-apache-dev/README.md +++ b/docker/php-apache-dev/README.md @@ -39,10 +39,10 @@ Variable | Description `CLI_SCRIPT` | Predefined CLI script for service `APPLICATION_UID` | PHP-FPM UID (Effective user ID) `APPLICATION_GID` | PHP-FPM GID (Effective group ID) -`WEB_DOCUMENT_ROOT` | Document root for Nginx -`WEB_DOCUMENT_INDEX` | Document index (eg. `index.php`) for Nginx -`WEB_ALIAS_DOMAIN` | Alias domains (eg. `*.vm`) for Nginx - +`WEB_DOCUMENT_ROOT` | Document root for Apache +`WEB_DOCUMENT_INDEX` | Document index (eg. `index.php`) for Apache +`WEB_ALIAS_DOMAIN` | Alias domains (eg. `*.vm`) for Apache +`PHP_DEBUGGER` | Either `xdebug`, `blackfire` or `none`. Default is `xdebug`. ## Container info diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-3-php7/Dockerfile index 4fc17efb1..82f05caa1 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -28,7 +28,7 @@ RUN /usr/local/bin/apk-install \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/alpine-3/Dockerfile b/docker/php-apache-dev/alpine-3/Dockerfile index 5f7c6e364..094b555d9 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -28,7 +28,7 @@ RUN /usr/local/bin/apk-install \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index 9ffa53568..f24efc765 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -26,7 +26,7 @@ RUN /usr/local/bin/yum-install \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index 61a3c3846..75b5d53a0 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -26,7 +26,7 @@ RUN /usr/local/bin/yum-install \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index 0cd77055c..84542f7b9 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index d4b931f64..f13e09d8f 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index 3a8fd9f4f..bee4c0fd7 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index f7fb5c277..a6aa5eb72 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index dc8e41e61..ed0268030 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -30,7 +30,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers version expires \ && mkdir -p /var/lock/apache2 \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index eb45877ee..ce0dacf75 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -30,7 +30,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ && mkdir -p /var/lock/apache2 \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index 1e588a0bd..143e2d895 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions fastcgi ssl rewrite headers expires \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index 5d4f8c39d..80d48d713 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions fastcgi ssl rewrite headers expires \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index 755dee89c..026d2335b 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions fastcgi ssl rewrite headers expires \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache/alpine-3-php7/Dockerfile b/docker/php-apache/alpine-3-php7/Dockerfile index 837d12766..74e29e186 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 07226ae38..865cd965b 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index 99f2a8898..74627537c 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 3a5e341be..98aecd152 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 dc31ed7df..c641a4719 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 8fad28f2e..58cd9cf0c 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 fa8e693c4..85939edea 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 cc860da76..e117b0462 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 134b4cc9a..d0ae2d408 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 ec68346d1..43efef887 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 177484ddd..245db0455 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 79332da7e..042d4a649 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 4ca4bb494..7bc88b394 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-dev/README.md b/docker/php-dev/README.md index fde1389bf..a789db9f2 100644 --- a/docker/php-dev/README.md +++ b/docker/php-dev/README.md @@ -22,4 +22,10 @@ Container | Distribution name | PHP Versi - [PHP Dead Code Detector](https://github.com/sebastianbergmann/phpdcd) - [PHP Coding Standards Fixer](http://cs.sensiolabs.org/) - [SensioLabs DeprecationDetector](https://github.com/sensiolabs-de/deprecation-detector) -- [PHP 7 Compatibility Checker](https://github.com/sstalle/php7cc) \ No newline at end of file +- [PHP 7 Compatibility Checker](https://github.com/sstalle/php7cc) + +## Environment variables + +Variable | Description +--------------------- | ------------------------------------------------------------------------------ +`PHP_DEBUGGER` | Either `xdebug`, `blackfire` or `none`. Default is `xdebug`. diff --git a/docker/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-3-php7/Dockerfile index c8aac2b7f..7f041ad8b 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index d6bdc859e..b62fbdf93 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index bce27f112..14432c5f4 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 8dace42e0..343d92053 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 72489ebaa..0f1c8dcdb 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index 76861c037..226435f87 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 2b7c24232..b6f5e4db1 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 83e3e0daf..b2b1c856d 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 5633b733c..c359fdd52 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index b62f28c9f..b40aa2a91 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index ecef17ef1..99c1c8eb1 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index d1e80c2ff..8a189daf5 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 69b102342..a40f4aa72 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/README.md b/docker/php-nginx-dev/README.md index 75d5c7689..db3c9751c 100644 --- a/docker/php-nginx-dev/README.md +++ b/docker/php-nginx-dev/README.md @@ -25,6 +25,7 @@ Variable | Description `WEB_DOCUMENT_ROOT` | Document root for Nginx `WEB_DOCUMENT_INDEX` | Document index (eg. `index.php`) for Nginx `WEB_ALIAS_DOMAIN` | Alias domains (eg. `*.vm`) for Nginx +`PHP_DEBUGGER` | Either `xdebug`, `blackfire` or `none`. Default is `xdebug`. ## Filesystem layout diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile b/docker/php-nginx-dev/alpine-3-php7/Dockerfile index 7db5e205d..6682c9f05 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apk-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile b/docker/php-nginx-dev/alpine-3/Dockerfile index 497ca6bd1..eb3c9d29c 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apk-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index 895148816..ad7c03cec 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install tools RUN /usr/local/bin/yum-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index 49701f02c..5ab5514a5 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install tools RUN /usr/local/bin/yum-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index d63386756..8b1081aca 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 0a9a1566e..c50271d1a 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index db01819b1..8f35ae7cf 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index dae698513..dd5e58e11 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index ea0192d0e..87c7d50ba 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index fa90df977..3e7d908c3 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 8e74bc3ae..ec52621c5 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index f1c4e655f..33f8f8c06 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index 568a7312c..2758e7606 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile b/docker/php-nginx/alpine-3-php7/Dockerfile index 4ba90e2ff..a521965b0 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 884a084f1..3dce90d10 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index 7c3f73b98..e03bb83d3 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 8596f014d..154d1e5e4 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 6b475297d..3cc9e6ff8 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 469073a38..1e3f62ed5 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 af8a8018b..a4c98ecb4 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 8ae035179..3a4439879 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 1f25f02c7..90865b459 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 c907b7e59..25142fc2f 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 9c689bbc6..14b7f542d 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 088f86b51..6592f3ff5 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 5ded5f6ae..d6c642083 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 2a00673a9..f33e69db5 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile index 7d09fd17e..144ee1b64 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 0d01af29e..c394888d1 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index 91995c111..1d784fcb0 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index 950e4df19..ac34fc09d 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 4f22b3daf..dde50bdf5 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 7903c93e9..78ed69ac3 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index aa257fae1..80b6f344b 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index 8b3b59fd0..aeebf2261 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 6e0c3a230..677d34891 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index 15d586c5c..c703e64fc 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index 2cf56cd68..051728a30 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index 9e898ca70..98c9ed0e5 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/piwik/ubuntu-14.04/Dockerfile b/docker/piwik/ubuntu-14.04/Dockerfile index 9a5de62c5..9d4ee8679 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 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 bf6fd030c..8778e7c94 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 0a9a1cc25..df8089ada 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ############################################################################### @@ -52,7 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible pysed \ + && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index a09d6690e..c2e78a3ba 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 RUN /usr/local/bin/apk-install \ # General sphinx diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 3f8e2232c..8bd2de970 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 RUN /opt/docker/bin/control.sh service.enable ssh diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index f49ba5bb2..1eef59ab1 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 RUN mkdir /storage/ \ && chmod 777 /storage/ diff --git a/docker/typo3/ubuntu-14.04/Dockerfile b/docker/typo3/ubuntu-14.04/Dockerfile index 9c3f58845..5e46d190f 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV WEB_DOCUMENT_ROOT /app/web/ diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index 1df291520..21b255d3f 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV VARNISH_PORT 80 diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index a9462a09c..eb6dc33e2 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 ENV FTP_USER application ENV FTP_PASSWORD application diff --git a/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh b/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh index 5c836f49d..a5b7aafe4 100644 --- a/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh +++ b/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh @@ -1,63 +1,56 @@ +#!/usr/bin/env bash # # Debugger switch # -function phpModuleEnable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' '\1' "$PHP_FILE" --write - fi - done -} +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi -function phpModuleDisable() { - for PHP_FILE in $*; do - if [[ -f "$PHP_FILE" ]]; then - pysed -r '^[; ]*((zend_)?(extension=.*))$' ';\1' "$PHP_FILE" --write - fi + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini done } -PHP_XDEBUG_FILES=" -/etc/php5/conf.d/xdebug.ini -/etc/php7/conf.d/xdebug.ini -/etc/php.d/xdebug.ini -/etc/php5/mods-available/xdebug.ini -/etc/php5/cli/conf.d/20-xdebug.ini -/etc/php5/cli/conf.d/xdebug.ini -/etc/php5/fpm/conf.d/20-xdebug.ini -/etc/php5/fpm/conf.d/xdebug.ini -/etc/php/7.0/mods-available/xdebug.ini -/etc/php/7.0/cli/conf.d/20-xdebug.ini -/etc/php/7.0/fpm/conf.d/20-xdebug.ini" - -PHP_BLACKFIRE_FILES=" -/etc/php.d/zz-blackfire.ini -/etc/php5/conf.d/90-blackfire.ini -/etc/php5/conf.d/zz-blackfire.ini -/etc/php5/cli/conf.d/90-blackfire.ini -/etc/php5/cli/conf.d/zz-blackfire.ini -/etc/php5/fpm/conf.d/90-blackfire.ini -/etc/php5/fpm/conf.d/zz-blackfire.ini -/etc/php/7.0/cli/conf.d/90-blackfire.ini -/etc/php/7.0/fpm/conf.d/90-blackfire.ini" if [[ -n "${PHP_DEBUGGER+x}" ]]; then case "$PHP_DEBUGGER" in xdebug) echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" ;; blackfire) echo "PHP-Debugger: Blackfire enabled" - phpModuleEnable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "xdebug" ;; none) echo "PHP-Debugger: none" - phpModuleDisable $PHP_BLACKFIRE_FILES - phpModuleDisable $PHP_XDEBUG_FILES + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" ;; esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + fi diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..d58a11d50 100644 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -5,4 +5,3 @@ - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml - include: bootstrap/php-module.xdebug.yml -- include: bootstrap/php-module.blackfire.yml diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml deleted file mode 100644 index a465aef6b..000000000 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Disable blackfire by default - replace: - dest: '{{ item }}' - regexp: '^[;\s]*((zend_)?(extension=))' - replace: ';\1' - ignore_errors: yes - with_items: - # RedHat - - "/etc/php.d/zz-blackfire.ini" - # Debian - PHP 5.x - - "/etc/php5/conf.d/90-blackfire.ini" - - "/etc/php5/conf.d/zz-blackfire.ini" - - "/etc/php5/cli/conf.d/90-blackfire.ini" - - "/etc/php5/cli/conf.d/zz-blackfire.ini" - - "/etc/php5/fpm/conf.d/90-blackfire.ini" - - "/etc/php5/fpm/conf.d/zz-blackfire.ini" - # Debian - PHP 7.x - - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" - - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index c34c818e1..bab86e826 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=8 -LABEL io.webdevops.version=0.53.0 +LABEL io.webdevops.version=0.53.1 {%- endmacro %} {%- macro add(source, target) -%} diff --git a/template/Dockerfile/images/bootstrap.jinja2 b/template/Dockerfile/images/bootstrap.jinja2 index 8867f96e8..20a365a47 100644 --- a/template/Dockerfile/images/bootstrap.jinja2 +++ b/template/Dockerfile/images/bootstrap.jinja2 @@ -28,7 +28,7 @@ RUN set -x \ py-paramiko \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible pysed \ + && pip install ansible \ && chmod 750 /usr/bin/ansible* \ # Cleanup && apk del python-dev @@ -59,7 +59,7 @@ RUN set -x \ && easy_install pip \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible pysed \ + && pip install ansible \ && chmod 750 /usr/bin/ansible* \ && yum erase -y python-devel \ && yum clean all @@ -98,7 +98,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible pysed \ + && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ @@ -144,7 +144,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ apt-transport-https \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible pysed \ + && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ @@ -188,7 +188,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ && pip install --upgrade pip \ && hash -r \ - && pip install ansible pysed \ + && pip install ansible \ && chmod 750 /usr/local/bin/ansible* \ # Cleanup && apt-get purge -y -f --force-yes \ diff --git a/test/spec/shared/bootstrap/toolchain.rb b/test/spec/shared/bootstrap/toolchain.rb index c9c28eeaa..2fa80796a 100644 --- a/test/spec/shared/bootstrap/toolchain.rb +++ b/test/spec/shared/bootstrap/toolchain.rb @@ -16,10 +16,6 @@ its(:exit_status) { should eq 0 } end - describe command('pysed --version') do - its(:exit_status) { should eq 0 } - end - describe command('rpl --version') do its(:exit_status) { should eq 0 } end