Skip to content

Commit fc6ca3b

Browse files
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
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
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
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
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
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-8-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
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-8/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
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-9/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
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/ubuntu-12.04/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
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/ubuntu-14.04/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
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/ubuntu-15.04/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
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/ubuntu-15.10/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
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/ubuntu-16.04/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
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-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
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-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
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-dev/centos-7-php56/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ LABEL io.webdevops.version=0.53.1
1212

1313
COPY conf/ /opt/docker/
1414

15-
RUN /usr/local/bin/yum-install \
15+
RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \
16+
&& /usr/local/bin/yum-install \
1617
# Install tools
1718
graphviz \
1819
# Install php development stuff
1920
php56w-pecl-xdebug \
21+
blackfire-php \
2022
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \
2123
&& /opt/docker/bin/bootstrap.sh
2224

docker/php-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
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-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
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-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
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-dev/debian-8-php7/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \
2020
graphviz \
2121
# Install php development stuff
2222
# php7.0-xdebug \ # Is currently not available
23+
blackfire-php \
2324
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \
2425
&& /opt/docker/bin/bootstrap.sh
2526

docker/php-dev/debian-8-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
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-dev/debian-8/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
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-dev/debian-9/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
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-dev/ubuntu-12.04/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
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-dev/ubuntu-14.04/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
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-dev/ubuntu-15.04/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

0 commit comments

Comments
 (0)