Skip to content

Commit fc6ca3b

Browse files
mblaschkemblaschke
committed
Add test for running php-dev with blackfire
Also fixed a php warning when blackfire is active
1 parent 36545fc commit fc6ca3b

File tree

87 files changed

+531
-5
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+531
-5
lines changed

‎docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
- include: bootstrap/php-module.yml
66
- include: bootstrap/php-module.opcache.yml
77
- include: bootstrap/php-module.xdebug.yml
8+
- include: bootstrap/php-module.blackfire.yml

‎docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
3+
- name: Remove superfluous blackfire configuration file
4+
file:
5+
path: '{{ item }}'
6+
state: absent
7+
with_items:
8+
- /etc/php5/cli/conf.d/zz-blackfire.ini
9+
- /etc/php5/fpm/conf.d/zz-blackfire.ini
10+
when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7

‎docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
- include: bootstrap/php-module.yml
66
- include: bootstrap/php-module.opcache.yml
77
- include: bootstrap/php-module.xdebug.yml
8+
- include: bootstrap/php-module.blackfire.yml

‎docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
3+
- name: Remove superfluous blackfire configuration file
4+
file:
5+
path: '{{ item }}'
6+
state: absent
7+
with_items:
8+
- /etc/php5/cli/conf.d/zz-blackfire.ini
9+
- /etc/php5/fpm/conf.d/zz-blackfire.ini
10+
when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7

‎docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
- include: bootstrap/php-module.yml
66
- include: bootstrap/php-module.opcache.yml
77
- include: bootstrap/php-module.xdebug.yml
8+
- include: bootstrap/php-module.blackfire.yml

‎docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
3+
- name: Remove superfluous blackfire configuration file
4+
file:
5+
path: '{{ item }}'
6+
state: absent
7+
with_items:
8+
- /etc/php5/cli/conf.d/zz-blackfire.ini
9+
- /etc/php5/fpm/conf.d/zz-blackfire.ini
10+
when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7

‎docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
- include: bootstrap/php-module.yml
66
- include: bootstrap/php-module.opcache.yml
77
- include: bootstrap/php-module.xdebug.yml
8+
- include: bootstrap/php-module.blackfire.yml

‎docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
3+
- name: Remove superfluous blackfire configuration file
4+
file:
5+
path: '{{ item }}'
6+
state: absent
7+
with_items:
8+
- /etc/php5/cli/conf.d/zz-blackfire.ini
9+
- /etc/php5/fpm/conf.d/zz-blackfire.ini
10+
when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7

‎docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
- include: bootstrap/php-module.yml
66
- include: bootstrap/php-module.opcache.yml
77
- include: bootstrap/php-module.xdebug.yml
8+
- include: bootstrap/php-module.blackfire.yml

‎docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
3+
- name: Remove superfluous blackfire configuration file
4+
file:
5+
path: '{{ item }}'
6+
state: absent
7+
with_items:
8+
- /etc/php5/cli/conf.d/zz-blackfire.ini
9+
- /etc/php5/fpm/conf.d/zz-blackfire.ini
10+
when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7

0 commit comments

Comments
 (0)