Skip to content

Commit 7147ecb

Browse files
committed
Merge branch 'hotfix/php-alpine-xdebug'
2 parents 9405e74 + a48faa0 commit 7147ecb

File tree

40 files changed

+160
-40
lines changed

40 files changed

+160
-40
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
# Ignored on php7
44
- name: Fix php xdebug module [Alpine family]
55
lineinfile:
6-
dest: '/etc/php/conf.d/xdebug.ini'
6+
dest: '{{ item }}'
77
regexp: 'extension=xdebug.so'
88
line: 'zend_extension=xdebug.so'
99
when: ansible_distribution == 'Alpine'
10+
with_items:
11+
- /etc/php5/conf.d/xdebug.ini
12+
- /etc/php7/conf.d/xdebug.ini
1013
ignore_errors: yes
1114

1215
- name: Setup php.ini for development environment

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
# Ignored on php7
44
- name: Fix php xdebug module [Alpine family]
55
lineinfile:
6-
dest: '/etc/php/conf.d/xdebug.ini'
6+
dest: '{{ item }}'
77
regexp: 'extension=xdebug.so'
88
line: 'zend_extension=xdebug.so'
99
when: ansible_distribution == 'Alpine'
10+
with_items:
11+
- /etc/php5/conf.d/xdebug.ini
12+
- /etc/php7/conf.d/xdebug.ini
1013
ignore_errors: yes
1114

1215
- name: Setup php.ini for development environment

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
# Ignored on php7
44
- name: Fix php xdebug module [Alpine family]
55
lineinfile:
6-
dest: '/etc/php/conf.d/xdebug.ini'
6+
dest: '{{ item }}'
77
regexp: 'extension=xdebug.so'
88
line: 'zend_extension=xdebug.so'
99
when: ansible_distribution == 'Alpine'
10+
with_items:
11+
- /etc/php5/conf.d/xdebug.ini
12+
- /etc/php7/conf.d/xdebug.ini
1013
ignore_errors: yes
1114

1215
- name: Setup php.ini for development environment

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
# Ignored on php7
44
- name: Fix php xdebug module [Alpine family]
55
lineinfile:
6-
dest: '/etc/php/conf.d/xdebug.ini'
6+
dest: '{{ item }}'
77
regexp: 'extension=xdebug.so'
88
line: 'zend_extension=xdebug.so'
99
when: ansible_distribution == 'Alpine'
10+
with_items:
11+
- /etc/php5/conf.d/xdebug.ini
12+
- /etc/php7/conf.d/xdebug.ini
1013
ignore_errors: yes
1114

1215
- name: Setup php.ini for development environment

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
# Ignored on php7
44
- name: Fix php xdebug module [Alpine family]
55
lineinfile:
6-
dest: '/etc/php/conf.d/xdebug.ini'
6+
dest: '{{ item }}'
77
regexp: 'extension=xdebug.so'
88
line: 'zend_extension=xdebug.so'
99
when: ansible_distribution == 'Alpine'
10+
with_items:
11+
- /etc/php5/conf.d/xdebug.ini
12+
- /etc/php7/conf.d/xdebug.ini
1013
ignore_errors: yes
1114

1215
- name: Setup php.ini for development environment

docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
# Ignored on php7
44
- name: Fix php xdebug module [Alpine family]
55
lineinfile:
6-
dest: '/etc/php/conf.d/xdebug.ini'
6+
dest: '{{ item }}'
77
regexp: 'extension=xdebug.so'
88
line: 'zend_extension=xdebug.so'
99
when: ansible_distribution == 'Alpine'
10+
with_items:
11+
- /etc/php5/conf.d/xdebug.ini
12+
- /etc/php7/conf.d/xdebug.ini
1013
ignore_errors: yes
1114

1215
- name: Setup php.ini for development environment

docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
# Ignored on php7
44
- name: Fix php xdebug module [Alpine family]
55
lineinfile:
6-
dest: '/etc/php/conf.d/xdebug.ini'
6+
dest: '{{ item }}'
77
regexp: 'extension=xdebug.so'
88
line: 'zend_extension=xdebug.so'
99
when: ansible_distribution == 'Alpine'
10+
with_items:
11+
- /etc/php5/conf.d/xdebug.ini
12+
- /etc/php7/conf.d/xdebug.ini
1013
ignore_errors: yes
1114

1215
- name: Setup php.ini for development environment

docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
# Ignored on php7
44
- name: Fix php xdebug module [Alpine family]
55
lineinfile:
6-
dest: '/etc/php/conf.d/xdebug.ini'
6+
dest: '{{ item }}'
77
regexp: 'extension=xdebug.so'
88
line: 'zend_extension=xdebug.so'
99
when: ansible_distribution == 'Alpine'
10+
with_items:
11+
- /etc/php5/conf.d/xdebug.ini
12+
- /etc/php7/conf.d/xdebug.ini
1013
ignore_errors: yes
1114

1215
- name: Setup php.ini for development environment

docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
# Ignored on php7
44
- name: Fix php xdebug module [Alpine family]
55
lineinfile:
6-
dest: '/etc/php/conf.d/xdebug.ini'
6+
dest: '{{ item }}'
77
regexp: 'extension=xdebug.so'
88
line: 'zend_extension=xdebug.so'
99
when: ansible_distribution == 'Alpine'
10+
with_items:
11+
- /etc/php5/conf.d/xdebug.ini
12+
- /etc/php7/conf.d/xdebug.ini
1013
ignore_errors: yes
1114

1215
- name: Setup php.ini for development environment

docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
# Ignored on php7
44
- name: Fix php xdebug module [Alpine family]
55
lineinfile:
6-
dest: '/etc/php/conf.d/xdebug.ini'
6+
dest: '{{ item }}'
77
regexp: 'extension=xdebug.so'
88
line: 'zend_extension=xdebug.so'
99
when: ansible_distribution == 'Alpine'
10+
with_items:
11+
- /etc/php5/conf.d/xdebug.ini
12+
- /etc/php7/conf.d/xdebug.ini
1013
ignore_errors: yes
1114

1215
- name: Setup php.ini for development environment

0 commit comments

Comments
 (0)