gh-mirrors/docker-php-fpm
1
0
Fork 0
mirror of https://github.com/devilbox/docker-php-fpm.git synced 2025-12-19 07:21:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure deprecated ini settings are removed in respective versions

Browse Source
This commit is contained in:
cytopia
2018-07-28 11:28:24 +02:00
parent 1b6799da58
commit 9c9d325724
9 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfiles/base/data/php.d/php-7.2.ini
View File

@@ -38,5 +38,4 @@ xmlrpc_errors = Off
report_memleaks = On report_memleaks = On
display_errors = Off display_errors = Off
display_startup_errors = Off display_startup_errors = Off
track_errors = On
log_errors = On log_errors = On

1
Dockerfiles/base/data/php.d/php-7.3.ini
View File

@@ -38,5 +38,4 @@ xmlrpc_errors = Off
report_memleaks = On report_memleaks = On
display_errors = Off display_errors = Off
display_startup_errors = Off display_startup_errors = Off
track_errors = On
log_errors = On log_errors = On

1
Dockerfiles/work/data/php.d/php-7.2.ini
View File

@@ -12,6 +12,5 @@
error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED
display_errors = On display_errors = On
display_startup_errors = On display_startup_errors = On
track_errors = On
log_errors = On log_errors = On
html_errors = On html_errors = On

1
Dockerfiles/work/data/php.d/php-7.3.ini
View File

@@ -12,6 +12,5 @@
error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED
display_errors = On display_errors = On
display_startup_errors = On display_startup_errors = On
track_errors = On
log_errors = On log_errors = On
html_errors = On html_errors = On

2
build/ansible/CONFIGURATION/php-base.ini → build/ansible/CONFIGURATION/php-base.ini.j2
View File

@@ -38,5 +38,7 @@ xmlrpc_errors = Off
report_memleaks = On report_memleaks = On
display_errors = Off display_errors = Off
display_startup_errors = Off display_startup_errors = Off
{% if php_version == 5.2 or php_version == 5.3 or php_version == 5.4 or php_version == 5.5 or php_version == 5.6 or php_version == 7.0 or php_version == 7.1 %}
track_errors = On track_errors = On
{% endif %}
log_errors = On log_errors = On

0
build/ansible/CONFIGURATION/php-prod.ini → build/ansible/CONFIGURATION/php-prod.ini.j2
View File

2
build/ansible/CONFIGURATION/php-work.ini → build/ansible/CONFIGURATION/php-work.ini.j2
View File

@@ -12,6 +12,8 @@
error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED
display_errors = On display_errors = On
display_startup_errors = On display_startup_errors = On
{% if php_version == 5.2 or php_version == 5.3 or php_version == 5.4 or php_version == 5.5 or php_version == 5.6 or php_version == 7.0 or php_version == 7.1 %}
track_errors = On track_errors = On
{% endif %}
log_errors = On log_errors = On
html_errors = On html_errors = On

6
build/ansible/group_vars/all.yml
View File

@@ -13,11 +13,11 @@ template_files:
# PHP.ini files to apply sane defaults # PHP.ini files to apply sane defaults
ini_files: ini_files:
- src: CONFIGURATION/php-base.ini - src: CONFIGURATION/php-base.ini.j2
dst: "../../Dockerfiles/base/data/php.d/php-{{ php_version }}.ini" dst: "../../Dockerfiles/base/data/php.d/php-{{ php_version }}.ini"
- src: CONFIGURATION/php-prod.ini - src: CONFIGURATION/php-prod.ini.j2
dst: "../../Dockerfiles/prod/data/php.d/php-{{ php_version }}.ini" dst: "../../Dockerfiles/prod/data/php.d/php-{{ php_version }}.ini"
- src: CONFIGURATION/php-work.ini - src: CONFIGURATION/php-work.ini.j2
dst: "../../Dockerfiles/work/data/php.d/php-{{ php_version }}.ini" dst: "../../Dockerfiles/work/data/php.d/php-{{ php_version }}.ini"

2
build/ansible/roles/template/tasks/main.yml
View File

@@ -10,7 +10,7 @@
- "{{ template_files }}" - "{{ template_files }}"
- name: copy php.ini configuration - name: copy php.ini configuration
copy: template:
src: "{{ item.src }}" src: "{{ item.src }}"
dest: "{{ item.dst }}" dest: "{{ item.dst }}"
force: True force: True