From 944b41b31d5c5e0b980a46f3748c9a3398c4e0af Mon Sep 17 00:00:00 2001 From: Choong Wei Tjeng Date: Mon, 27 Jun 2016 17:20:52 +0200 Subject: [PATCH 1/4] Don't install pysed --- docker/bootstrap/alpine-3/Dockerfile | 2 +- docker/bootstrap/centos-7/Dockerfile | 2 +- docker/bootstrap/debian-7/Dockerfile | 2 +- docker/bootstrap/debian-8/Dockerfile | 2 +- docker/bootstrap/debian-9/Dockerfile | 2 +- docker/bootstrap/ubuntu-12.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-14.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-15.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-15.10/Dockerfile | 2 +- docker/bootstrap/ubuntu-16.04/Dockerfile | 2 +- docker/samson-deployment/latest/Dockerfile | 2 +- template/Dockerfile/images/bootstrap.jinja2 | 10 +++++----- test/spec/shared/bootstrap/toolchain.rb | 4 ---- 13 files changed, 16 insertions(+), 20 deletions(-) diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 1b1283342..25189b04b 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -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..e2f18a07b 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -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..b5604b928 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -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..20d939619 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -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..062716ff5 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -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..5ac48b508 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -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..4208b8a68 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -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..7b2e507d5 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -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..30bb5a7e9 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -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..6c1867c41 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -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/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 0a9a1cc25..d8c1a0f2c 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -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/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 From 382c58df7ae7ed9fd686de0d467b47cf35a20f2d Mon Sep 17 00:00:00 2001 From: Choong Wei Tjeng Date: Mon, 27 Jun 2016 19:37:51 +0200 Subject: [PATCH 2/4] Don't disable blackfire by default --- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/php-module.blackfire.yml | 21 ------------------- 80 files changed, 880 deletions(-) delete mode 100644 docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml delete mode 100644 provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml 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/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/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/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/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/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/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/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/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/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/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/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/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-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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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" From 37d71e4aade812d2c6f9a8e0a096abd7268a6cf6 Mon Sep 17 00:00:00 2001 From: Choong Wei Tjeng Date: Mon, 27 Jun 2016 19:45:19 +0200 Subject: [PATCH 3/4] Delete PHP debugger ini files instead of disabling Because the container is stateless, removing is good enough. --- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- .../provision/entrypoint.d/10-php-debugger.sh | 71 +++++++++---------- 40 files changed, 1280 insertions(+), 1560 deletions(-) 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/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/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/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/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-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/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-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/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-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-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.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-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-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/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/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/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/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-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/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-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/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-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-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.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-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-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/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/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/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/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-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/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-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/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-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-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.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-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/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 From fcc627d472f4ed5145e4f88fd70b9ade7544a509 Mon Sep 17 00:00:00 2001 From: Choong Wei Tjeng Date: Mon, 27 Jun 2016 19:50:29 +0200 Subject: [PATCH 4/4] Update documentation --- docker/php-apache-dev/README.md | 8 ++++---- docker/php-dev/README.md | 8 +++++++- docker/php-nginx-dev/README.md | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) 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-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-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