From 1b6799da58dea474f5d20e111258c2b22524d842 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 28 Jul 2018 10:55:57 +0200 Subject: [PATCH] Sane defaults for php.ini --- Dockerfiles/base/Dockerfile-5.3 | 1 + Dockerfiles/base/Dockerfile-5.4 | 1 + Dockerfiles/base/Dockerfile-5.5 | 1 + Dockerfiles/base/Dockerfile-5.6 | 1 + Dockerfiles/base/Dockerfile-7.0 | 1 + Dockerfiles/base/Dockerfile-7.1 | 1 + Dockerfiles/base/Dockerfile-7.2 | 1 + Dockerfiles/base/Dockerfile-7.3 | 1 + Dockerfiles/base/data/php.d/php-5.3.ini | 42 +++++++++++++++++++ Dockerfiles/base/data/php.d/php-5.4.ini | 42 +++++++++++++++++++ Dockerfiles/base/data/php.d/php-5.5.ini | 42 +++++++++++++++++++ Dockerfiles/base/data/php.d/php-5.6.ini | 42 +++++++++++++++++++ Dockerfiles/base/data/php.d/php-7.0.ini | 42 +++++++++++++++++++ Dockerfiles/base/data/php.d/php-7.1.ini | 42 +++++++++++++++++++ Dockerfiles/base/data/php.d/php-7.2.ini | 42 +++++++++++++++++++ Dockerfiles/base/data/php.d/php-7.3.ini | 42 +++++++++++++++++++ Dockerfiles/prod/Dockerfile-5.3 | 1 + Dockerfiles/prod/Dockerfile-5.4 | 1 + Dockerfiles/prod/Dockerfile-5.5 | 1 + Dockerfiles/prod/Dockerfile-5.6 | 1 + Dockerfiles/prod/Dockerfile-7.0 | 1 + Dockerfiles/prod/Dockerfile-7.1 | 1 + Dockerfiles/prod/Dockerfile-7.2 | 1 + Dockerfiles/prod/Dockerfile-7.3 | 1 + Dockerfiles/prod/data/php.d/php-5.3.ini | 9 ++++ Dockerfiles/prod/data/php.d/php-5.4.ini | 9 ++++ Dockerfiles/prod/data/php.d/php-5.5.ini | 9 ++++ Dockerfiles/prod/data/php.d/php-5.6.ini | 9 ++++ Dockerfiles/prod/data/php.d/php-7.0.ini | 9 ++++ Dockerfiles/prod/data/php.d/php-7.1.ini | 9 ++++ Dockerfiles/prod/data/php.d/php-7.2.ini | 9 ++++ Dockerfiles/prod/data/php.d/php-7.3.ini | 9 ++++ Dockerfiles/work/Dockerfile-5.3 | 2 +- Dockerfiles/work/Dockerfile-5.4 | 2 +- Dockerfiles/work/Dockerfile-5.5 | 2 +- Dockerfiles/work/Dockerfile-5.6 | 2 +- Dockerfiles/work/Dockerfile-7.0 | 2 +- Dockerfiles/work/Dockerfile-7.1 | 2 +- Dockerfiles/work/Dockerfile-7.2 | 2 +- Dockerfiles/work/Dockerfile-7.3 | 2 +- .../work/data/php.d/error-reporting.ini | 12 ------ Dockerfiles/work/data/php.d/php-5.3.ini | 17 ++++++++ Dockerfiles/work/data/php.d/php-5.4.ini | 17 ++++++++ Dockerfiles/work/data/php.d/php-5.5.ini | 17 ++++++++ Dockerfiles/work/data/php.d/php-5.6.ini | 17 ++++++++ Dockerfiles/work/data/php.d/php-7.0.ini | 17 ++++++++ Dockerfiles/work/data/php.d/php-7.1.ini | 17 ++++++++ Dockerfiles/work/data/php.d/php-7.2.ini | 17 ++++++++ Dockerfiles/work/data/php.d/php-7.3.ini | 17 ++++++++ README.md | 27 +++++++++--- build/ansible/CONFIGURATION/php-base.ini | 42 +++++++++++++++++++ build/ansible/CONFIGURATION/php-prod.ini | 9 ++++ build/ansible/CONFIGURATION/php-work.ini | 17 ++++++++ build/ansible/DOCKERFILES/Dockerfile-base.j2 | 1 + build/ansible/DOCKERFILES/Dockerfile-prod.j2 | 1 + build/ansible/DOCKERFILES/Dockerfile-work.j2 | 2 +- build/ansible/group_vars/all.yml | 9 ++++ build/ansible/roles/template/tasks/main.yml | 13 +++++- 58 files changed, 680 insertions(+), 29 deletions(-) create mode 100644 Dockerfiles/base/data/php.d/php-5.3.ini create mode 100644 Dockerfiles/base/data/php.d/php-5.4.ini create mode 100644 Dockerfiles/base/data/php.d/php-5.5.ini create mode 100644 Dockerfiles/base/data/php.d/php-5.6.ini create mode 100644 Dockerfiles/base/data/php.d/php-7.0.ini create mode 100644 Dockerfiles/base/data/php.d/php-7.1.ini create mode 100644 Dockerfiles/base/data/php.d/php-7.2.ini create mode 100644 Dockerfiles/base/data/php.d/php-7.3.ini create mode 100644 Dockerfiles/prod/data/php.d/php-5.3.ini create mode 100644 Dockerfiles/prod/data/php.d/php-5.4.ini create mode 100644 Dockerfiles/prod/data/php.d/php-5.5.ini create mode 100644 Dockerfiles/prod/data/php.d/php-5.6.ini create mode 100644 Dockerfiles/prod/data/php.d/php-7.0.ini create mode 100644 Dockerfiles/prod/data/php.d/php-7.1.ini create mode 100644 Dockerfiles/prod/data/php.d/php-7.2.ini create mode 100644 Dockerfiles/prod/data/php.d/php-7.3.ini delete mode 100644 Dockerfiles/work/data/php.d/error-reporting.ini create mode 100644 Dockerfiles/work/data/php.d/php-5.3.ini create mode 100644 Dockerfiles/work/data/php.d/php-5.4.ini create mode 100644 Dockerfiles/work/data/php.d/php-5.5.ini create mode 100644 Dockerfiles/work/data/php.d/php-5.6.ini create mode 100644 Dockerfiles/work/data/php.d/php-7.0.ini create mode 100644 Dockerfiles/work/data/php.d/php-7.1.ini create mode 100644 Dockerfiles/work/data/php.d/php-7.2.ini create mode 100644 Dockerfiles/work/data/php.d/php-7.3.ini create mode 100644 build/ansible/CONFIGURATION/php-base.ini create mode 100644 build/ansible/CONFIGURATION/php-prod.ini create mode 100644 build/ansible/CONFIGURATION/php-work.ini diff --git a/Dockerfiles/base/Dockerfile-5.3 b/Dockerfiles/base/Dockerfile-5.3 index e45ea96..f1f19ae 100644 --- a/Dockerfiles/base/Dockerfile-5.3 +++ b/Dockerfiles/base/Dockerfile-5.3 @@ -56,6 +56,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-5.3.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf diff --git a/Dockerfiles/base/Dockerfile-5.4 b/Dockerfiles/base/Dockerfile-5.4 index aabf29f..167f919 100644 --- a/Dockerfiles/base/Dockerfile-5.4 +++ b/Dockerfiles/base/Dockerfile-5.4 @@ -56,6 +56,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-5.4.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf diff --git a/Dockerfiles/base/Dockerfile-5.5 b/Dockerfiles/base/Dockerfile-5.5 index a1bc353..d184f9a 100644 --- a/Dockerfiles/base/Dockerfile-5.5 +++ b/Dockerfiles/base/Dockerfile-5.5 @@ -56,6 +56,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-5.5.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf diff --git a/Dockerfiles/base/Dockerfile-5.6 b/Dockerfiles/base/Dockerfile-5.6 index 9f257f3..71c9f4b 100644 --- a/Dockerfiles/base/Dockerfile-5.6 +++ b/Dockerfiles/base/Dockerfile-5.6 @@ -56,6 +56,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-5.6.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf diff --git a/Dockerfiles/base/Dockerfile-7.0 b/Dockerfiles/base/Dockerfile-7.0 index 6772aef..5430c30 100644 --- a/Dockerfiles/base/Dockerfile-7.0 +++ b/Dockerfiles/base/Dockerfile-7.0 @@ -56,6 +56,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-7.0.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf diff --git a/Dockerfiles/base/Dockerfile-7.1 b/Dockerfiles/base/Dockerfile-7.1 index b7cb040..9a267cd 100644 --- a/Dockerfiles/base/Dockerfile-7.1 +++ b/Dockerfiles/base/Dockerfile-7.1 @@ -56,6 +56,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-7.1.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf diff --git a/Dockerfiles/base/Dockerfile-7.2 b/Dockerfiles/base/Dockerfile-7.2 index fcf4ca8..381de2f 100644 --- a/Dockerfiles/base/Dockerfile-7.2 +++ b/Dockerfiles/base/Dockerfile-7.2 @@ -56,6 +56,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-7.2.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf diff --git a/Dockerfiles/base/Dockerfile-7.3 b/Dockerfiles/base/Dockerfile-7.3 index 75d714d..aa82ff0 100644 --- a/Dockerfiles/base/Dockerfile-7.3 +++ b/Dockerfiles/base/Dockerfile-7.3 @@ -56,6 +56,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-7.3.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf diff --git a/Dockerfiles/base/data/php.d/php-5.3.ini b/Dockerfiles/base/data/php.d/php-5.3.ini new file mode 100644 index 0000000..b3de1ec --- /dev/null +++ b/Dockerfiles/base/data/php.d/php-5.3.ini @@ -0,0 +1,42 @@ +; ############################################################ +; # Devilbox PHP defaults for all Docker images +; ############################################################ + +; This php.ini is applied to the base container and inherited +; by every image built on top of it. +; Note that prod and work images overwrite specific settings +; for their use-case. + + +[PHP] + +; Memory +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +post_max_size = 256M +upload_max_filesize = 256M +max_file_uploads = 20 + + +; Vars +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 + + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +track_errors = On +log_errors = On diff --git a/Dockerfiles/base/data/php.d/php-5.4.ini b/Dockerfiles/base/data/php.d/php-5.4.ini new file mode 100644 index 0000000..b3de1ec --- /dev/null +++ b/Dockerfiles/base/data/php.d/php-5.4.ini @@ -0,0 +1,42 @@ +; ############################################################ +; # Devilbox PHP defaults for all Docker images +; ############################################################ + +; This php.ini is applied to the base container and inherited +; by every image built on top of it. +; Note that prod and work images overwrite specific settings +; for their use-case. + + +[PHP] + +; Memory +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +post_max_size = 256M +upload_max_filesize = 256M +max_file_uploads = 20 + + +; Vars +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 + + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +track_errors = On +log_errors = On diff --git a/Dockerfiles/base/data/php.d/php-5.5.ini b/Dockerfiles/base/data/php.d/php-5.5.ini new file mode 100644 index 0000000..b3de1ec --- /dev/null +++ b/Dockerfiles/base/data/php.d/php-5.5.ini @@ -0,0 +1,42 @@ +; ############################################################ +; # Devilbox PHP defaults for all Docker images +; ############################################################ + +; This php.ini is applied to the base container and inherited +; by every image built on top of it. +; Note that prod and work images overwrite specific settings +; for their use-case. + + +[PHP] + +; Memory +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +post_max_size = 256M +upload_max_filesize = 256M +max_file_uploads = 20 + + +; Vars +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 + + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +track_errors = On +log_errors = On diff --git a/Dockerfiles/base/data/php.d/php-5.6.ini b/Dockerfiles/base/data/php.d/php-5.6.ini new file mode 100644 index 0000000..b3de1ec --- /dev/null +++ b/Dockerfiles/base/data/php.d/php-5.6.ini @@ -0,0 +1,42 @@ +; ############################################################ +; # Devilbox PHP defaults for all Docker images +; ############################################################ + +; This php.ini is applied to the base container and inherited +; by every image built on top of it. +; Note that prod and work images overwrite specific settings +; for their use-case. + + +[PHP] + +; Memory +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +post_max_size = 256M +upload_max_filesize = 256M +max_file_uploads = 20 + + +; Vars +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 + + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +track_errors = On +log_errors = On diff --git a/Dockerfiles/base/data/php.d/php-7.0.ini b/Dockerfiles/base/data/php.d/php-7.0.ini new file mode 100644 index 0000000..b3de1ec --- /dev/null +++ b/Dockerfiles/base/data/php.d/php-7.0.ini @@ -0,0 +1,42 @@ +; ############################################################ +; # Devilbox PHP defaults for all Docker images +; ############################################################ + +; This php.ini is applied to the base container and inherited +; by every image built on top of it. +; Note that prod and work images overwrite specific settings +; for their use-case. + + +[PHP] + +; Memory +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +post_max_size = 256M +upload_max_filesize = 256M +max_file_uploads = 20 + + +; Vars +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 + + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +track_errors = On +log_errors = On diff --git a/Dockerfiles/base/data/php.d/php-7.1.ini b/Dockerfiles/base/data/php.d/php-7.1.ini new file mode 100644 index 0000000..b3de1ec --- /dev/null +++ b/Dockerfiles/base/data/php.d/php-7.1.ini @@ -0,0 +1,42 @@ +; ############################################################ +; # Devilbox PHP defaults for all Docker images +; ############################################################ + +; This php.ini is applied to the base container and inherited +; by every image built on top of it. +; Note that prod and work images overwrite specific settings +; for their use-case. + + +[PHP] + +; Memory +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +post_max_size = 256M +upload_max_filesize = 256M +max_file_uploads = 20 + + +; Vars +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 + + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +track_errors = On +log_errors = On diff --git a/Dockerfiles/base/data/php.d/php-7.2.ini b/Dockerfiles/base/data/php.d/php-7.2.ini new file mode 100644 index 0000000..b3de1ec --- /dev/null +++ b/Dockerfiles/base/data/php.d/php-7.2.ini @@ -0,0 +1,42 @@ +; ############################################################ +; # Devilbox PHP defaults for all Docker images +; ############################################################ + +; This php.ini is applied to the base container and inherited +; by every image built on top of it. +; Note that prod and work images overwrite specific settings +; for their use-case. + + +[PHP] + +; Memory +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +post_max_size = 256M +upload_max_filesize = 256M +max_file_uploads = 20 + + +; Vars +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 + + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +track_errors = On +log_errors = On diff --git a/Dockerfiles/base/data/php.d/php-7.3.ini b/Dockerfiles/base/data/php.d/php-7.3.ini new file mode 100644 index 0000000..b3de1ec --- /dev/null +++ b/Dockerfiles/base/data/php.d/php-7.3.ini @@ -0,0 +1,42 @@ +; ############################################################ +; # Devilbox PHP defaults for all Docker images +; ############################################################ + +; This php.ini is applied to the base container and inherited +; by every image built on top of it. +; Note that prod and work images overwrite specific settings +; for their use-case. + + +[PHP] + +; Memory +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +post_max_size = 256M +upload_max_filesize = 256M +max_file_uploads = 20 + + +; Vars +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 + + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +track_errors = On +log_errors = On diff --git a/Dockerfiles/prod/Dockerfile-5.3 b/Dockerfiles/prod/Dockerfile-5.3 index c518baa..2daac92 100644 --- a/Dockerfiles/prod/Dockerfile-5.3 +++ b/Dockerfiles/prod/Dockerfile-5.3 @@ -48,6 +48,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-5.3.ini /usr/local/etc/php/conf.d/yyy-devilbox-03-prod.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/postfix.sh /usr/local/sbin/postfix.sh diff --git a/Dockerfiles/prod/Dockerfile-5.4 b/Dockerfiles/prod/Dockerfile-5.4 index 8ae6806..e4214c2 100644 --- a/Dockerfiles/prod/Dockerfile-5.4 +++ b/Dockerfiles/prod/Dockerfile-5.4 @@ -48,6 +48,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-5.4.ini /usr/local/etc/php/conf.d/yyy-devilbox-03-prod.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/postfix.sh /usr/local/sbin/postfix.sh diff --git a/Dockerfiles/prod/Dockerfile-5.5 b/Dockerfiles/prod/Dockerfile-5.5 index df204b8..d6bee4b 100644 --- a/Dockerfiles/prod/Dockerfile-5.5 +++ b/Dockerfiles/prod/Dockerfile-5.5 @@ -48,6 +48,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-5.5.ini /usr/local/etc/php/conf.d/yyy-devilbox-03-prod.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/postfix.sh /usr/local/sbin/postfix.sh diff --git a/Dockerfiles/prod/Dockerfile-5.6 b/Dockerfiles/prod/Dockerfile-5.6 index c920672..4a86296 100644 --- a/Dockerfiles/prod/Dockerfile-5.6 +++ b/Dockerfiles/prod/Dockerfile-5.6 @@ -48,6 +48,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-5.6.ini /usr/local/etc/php/conf.d/yyy-devilbox-03-prod.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/postfix.sh /usr/local/sbin/postfix.sh diff --git a/Dockerfiles/prod/Dockerfile-7.0 b/Dockerfiles/prod/Dockerfile-7.0 index 6d61515..35e4688 100644 --- a/Dockerfiles/prod/Dockerfile-7.0 +++ b/Dockerfiles/prod/Dockerfile-7.0 @@ -48,6 +48,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-7.0.ini /usr/local/etc/php/conf.d/yyy-devilbox-03-prod.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/postfix.sh /usr/local/sbin/postfix.sh diff --git a/Dockerfiles/prod/Dockerfile-7.1 b/Dockerfiles/prod/Dockerfile-7.1 index ee4d98b..1e8a5cd 100644 --- a/Dockerfiles/prod/Dockerfile-7.1 +++ b/Dockerfiles/prod/Dockerfile-7.1 @@ -48,6 +48,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-7.1.ini /usr/local/etc/php/conf.d/yyy-devilbox-03-prod.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/postfix.sh /usr/local/sbin/postfix.sh diff --git a/Dockerfiles/prod/Dockerfile-7.2 b/Dockerfiles/prod/Dockerfile-7.2 index bae41cd..3dd8eb5 100644 --- a/Dockerfiles/prod/Dockerfile-7.2 +++ b/Dockerfiles/prod/Dockerfile-7.2 @@ -48,6 +48,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-7.2.ini /usr/local/etc/php/conf.d/yyy-devilbox-03-prod.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/postfix.sh /usr/local/sbin/postfix.sh diff --git a/Dockerfiles/prod/Dockerfile-7.3 b/Dockerfiles/prod/Dockerfile-7.3 index 7beefbb..91c6236 100644 --- a/Dockerfiles/prod/Dockerfile-7.3 +++ b/Dockerfiles/prod/Dockerfile-7.3 @@ -48,6 +48,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-7.3.ini /usr/local/etc/php/conf.d/yyy-devilbox-03-prod.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/postfix.sh /usr/local/sbin/postfix.sh diff --git a/Dockerfiles/prod/data/php.d/php-5.3.ini b/Dockerfiles/prod/data/php.d/php-5.3.ini new file mode 100644 index 0000000..cbbb137 --- /dev/null +++ b/Dockerfiles/prod/data/php.d/php-5.3.ini @@ -0,0 +1,9 @@ +; ############################################################ +; # Devilbox PHP defaults for all production Docker images +; ############################################################ + +; This php.ini is applied to the prod container and inherited +; by every image built on top of it. + + +[PHP] diff --git a/Dockerfiles/prod/data/php.d/php-5.4.ini b/Dockerfiles/prod/data/php.d/php-5.4.ini new file mode 100644 index 0000000..cbbb137 --- /dev/null +++ b/Dockerfiles/prod/data/php.d/php-5.4.ini @@ -0,0 +1,9 @@ +; ############################################################ +; # Devilbox PHP defaults for all production Docker images +; ############################################################ + +; This php.ini is applied to the prod container and inherited +; by every image built on top of it. + + +[PHP] diff --git a/Dockerfiles/prod/data/php.d/php-5.5.ini b/Dockerfiles/prod/data/php.d/php-5.5.ini new file mode 100644 index 0000000..cbbb137 --- /dev/null +++ b/Dockerfiles/prod/data/php.d/php-5.5.ini @@ -0,0 +1,9 @@ +; ############################################################ +; # Devilbox PHP defaults for all production Docker images +; ############################################################ + +; This php.ini is applied to the prod container and inherited +; by every image built on top of it. + + +[PHP] diff --git a/Dockerfiles/prod/data/php.d/php-5.6.ini b/Dockerfiles/prod/data/php.d/php-5.6.ini new file mode 100644 index 0000000..cbbb137 --- /dev/null +++ b/Dockerfiles/prod/data/php.d/php-5.6.ini @@ -0,0 +1,9 @@ +; ############################################################ +; # Devilbox PHP defaults for all production Docker images +; ############################################################ + +; This php.ini is applied to the prod container and inherited +; by every image built on top of it. + + +[PHP] diff --git a/Dockerfiles/prod/data/php.d/php-7.0.ini b/Dockerfiles/prod/data/php.d/php-7.0.ini new file mode 100644 index 0000000..cbbb137 --- /dev/null +++ b/Dockerfiles/prod/data/php.d/php-7.0.ini @@ -0,0 +1,9 @@ +; ############################################################ +; # Devilbox PHP defaults for all production Docker images +; ############################################################ + +; This php.ini is applied to the prod container and inherited +; by every image built on top of it. + + +[PHP] diff --git a/Dockerfiles/prod/data/php.d/php-7.1.ini b/Dockerfiles/prod/data/php.d/php-7.1.ini new file mode 100644 index 0000000..cbbb137 --- /dev/null +++ b/Dockerfiles/prod/data/php.d/php-7.1.ini @@ -0,0 +1,9 @@ +; ############################################################ +; # Devilbox PHP defaults for all production Docker images +; ############################################################ + +; This php.ini is applied to the prod container and inherited +; by every image built on top of it. + + +[PHP] diff --git a/Dockerfiles/prod/data/php.d/php-7.2.ini b/Dockerfiles/prod/data/php.d/php-7.2.ini new file mode 100644 index 0000000..cbbb137 --- /dev/null +++ b/Dockerfiles/prod/data/php.d/php-7.2.ini @@ -0,0 +1,9 @@ +; ############################################################ +; # Devilbox PHP defaults for all production Docker images +; ############################################################ + +; This php.ini is applied to the prod container and inherited +; by every image built on top of it. + + +[PHP] diff --git a/Dockerfiles/prod/data/php.d/php-7.3.ini b/Dockerfiles/prod/data/php.d/php-7.3.ini new file mode 100644 index 0000000..cbbb137 --- /dev/null +++ b/Dockerfiles/prod/data/php.d/php-7.3.ini @@ -0,0 +1,9 @@ +; ############################################################ +; # Devilbox PHP defaults for all production Docker images +; ############################################################ + +; This php.ini is applied to the prod container and inherited +; by every image built on top of it. + + +[PHP] diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 7f3b951..56ec597 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -310,7 +310,7 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/error-reporting.ini /usr/local/etc/php/conf.d/devilbox-error-reporting.ini +COPY ./data/php.d/php-5.3.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 8a346c5..83046b2 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -325,7 +325,7 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/error-reporting.ini /usr/local/etc/php/conf.d/devilbox-error-reporting.ini +COPY ./data/php.d/php-5.4.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index deb9640..746220f 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -334,7 +334,7 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/error-reporting.ini /usr/local/etc/php/conf.d/devilbox-error-reporting.ini +COPY ./data/php.d/php-5.5.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 5cff037..759a1a5 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -334,7 +334,7 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/error-reporting.ini /usr/local/etc/php/conf.d/devilbox-error-reporting.ini +COPY ./data/php.d/php-5.6.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index a1e774e..78c4bd5 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -334,7 +334,7 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/error-reporting.ini /usr/local/etc/php/conf.d/devilbox-error-reporting.ini +COPY ./data/php.d/php-7.0.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index fc40847..7303731 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -334,7 +334,7 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/error-reporting.ini /usr/local/etc/php/conf.d/devilbox-error-reporting.ini +COPY ./data/php.d/php-7.1.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 8464c82..0035cf5 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -334,7 +334,7 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/error-reporting.ini /usr/local/etc/php/conf.d/devilbox-error-reporting.ini +COPY ./data/php.d/php-7.2.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index acf1be6..e8e3c23 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -322,7 +322,7 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/error-reporting.ini /usr/local/etc/php/conf.d/devilbox-error-reporting.ini +COPY ./data/php.d/php-7.3.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox diff --git a/Dockerfiles/work/data/php.d/error-reporting.ini b/Dockerfiles/work/data/php.d/error-reporting.ini deleted file mode 100644 index 398000f..0000000 --- a/Dockerfiles/work/data/php.d/error-reporting.ini +++ /dev/null @@ -1,12 +0,0 @@ -; PHP Development configuration for errors - -; Show all errors -display_errors = On -display_startup_errors = On - -; Log all errors -log_errors = On - -; What errors to show/log -error_reporting = E_ALL | E_STRICT -xmlrpc_errors = On diff --git a/Dockerfiles/work/data/php.d/php-5.3.ini b/Dockerfiles/work/data/php.d/php-5.3.ini new file mode 100644 index 0000000..ba7061a --- /dev/null +++ b/Dockerfiles/work/data/php.d/php-5.3.ini @@ -0,0 +1,17 @@ +; ############################################################ +; # Devilbox PHP defaults for all development Docker images +; ############################################################ + +; This php.ini is applied to the work container. + + +[PHP] + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +display_errors = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On diff --git a/Dockerfiles/work/data/php.d/php-5.4.ini b/Dockerfiles/work/data/php.d/php-5.4.ini new file mode 100644 index 0000000..ba7061a --- /dev/null +++ b/Dockerfiles/work/data/php.d/php-5.4.ini @@ -0,0 +1,17 @@ +; ############################################################ +; # Devilbox PHP defaults for all development Docker images +; ############################################################ + +; This php.ini is applied to the work container. + + +[PHP] + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +display_errors = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On diff --git a/Dockerfiles/work/data/php.d/php-5.5.ini b/Dockerfiles/work/data/php.d/php-5.5.ini new file mode 100644 index 0000000..ba7061a --- /dev/null +++ b/Dockerfiles/work/data/php.d/php-5.5.ini @@ -0,0 +1,17 @@ +; ############################################################ +; # Devilbox PHP defaults for all development Docker images +; ############################################################ + +; This php.ini is applied to the work container. + + +[PHP] + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +display_errors = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On diff --git a/Dockerfiles/work/data/php.d/php-5.6.ini b/Dockerfiles/work/data/php.d/php-5.6.ini new file mode 100644 index 0000000..ba7061a --- /dev/null +++ b/Dockerfiles/work/data/php.d/php-5.6.ini @@ -0,0 +1,17 @@ +; ############################################################ +; # Devilbox PHP defaults for all development Docker images +; ############################################################ + +; This php.ini is applied to the work container. + + +[PHP] + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +display_errors = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On diff --git a/Dockerfiles/work/data/php.d/php-7.0.ini b/Dockerfiles/work/data/php.d/php-7.0.ini new file mode 100644 index 0000000..ba7061a --- /dev/null +++ b/Dockerfiles/work/data/php.d/php-7.0.ini @@ -0,0 +1,17 @@ +; ############################################################ +; # Devilbox PHP defaults for all development Docker images +; ############################################################ + +; This php.ini is applied to the work container. + + +[PHP] + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +display_errors = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On diff --git a/Dockerfiles/work/data/php.d/php-7.1.ini b/Dockerfiles/work/data/php.d/php-7.1.ini new file mode 100644 index 0000000..ba7061a --- /dev/null +++ b/Dockerfiles/work/data/php.d/php-7.1.ini @@ -0,0 +1,17 @@ +; ############################################################ +; # Devilbox PHP defaults for all development Docker images +; ############################################################ + +; This php.ini is applied to the work container. + + +[PHP] + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +display_errors = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On diff --git a/Dockerfiles/work/data/php.d/php-7.2.ini b/Dockerfiles/work/data/php.d/php-7.2.ini new file mode 100644 index 0000000..ba7061a --- /dev/null +++ b/Dockerfiles/work/data/php.d/php-7.2.ini @@ -0,0 +1,17 @@ +; ############################################################ +; # Devilbox PHP defaults for all development Docker images +; ############################################################ + +; This php.ini is applied to the work container. + + +[PHP] + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +display_errors = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On diff --git a/Dockerfiles/work/data/php.d/php-7.3.ini b/Dockerfiles/work/data/php.d/php-7.3.ini new file mode 100644 index 0000000..ba7061a --- /dev/null +++ b/Dockerfiles/work/data/php.d/php-7.3.ini @@ -0,0 +1,17 @@ +; ############################################################ +; # Devilbox PHP defaults for all development Docker images +; ############################################################ + +; This php.ini is applied to the work container. + + +[PHP] + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +display_errors = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On diff --git a/README.md b/README.md index 12863ab..392d122 100644 --- a/README.md +++ b/README.md @@ -37,10 +37,11 @@ versions and packed with different types of integrated PHP modules. It also solv 1. [Environment variables](#environment-variables) 2. [Volumes](#volumes) 3. [Ports](#ports) -5. **[Integrated Development Environment](#integrated-development-environment)** +5. **[PHP Default Configuration](#php-default-configuration)** +6. **[Integrated Development Environment](#integrated-development-environment)** 1. [What toos can you expect](#what-tools-can-you-expect) 2. [What else is available](#what-else-is-available) -6. **[Examples](#examples)** +7. **[Examples](#examples)** 1. [Provide PHP-FPM port to host](#provide-php-fpm-port-to-host) 2. [Alter PHP-FPM and system timezone](#alter-php-fpm-and-system-timezone) 3. [Load custom PHP configuration](#load-custom-php-configuration) @@ -50,10 +51,10 @@ versions and packed with different types of integrated PHP modules. It also solv 7. [Launch Postfix for mail-catching](#launch-postfix-for-mail-catching) 8. [Webserver and PHP-FPM](#webserver-and-php-fpm) 9. [Create MySQL Backups](#create-mysql-backups) -7. **[Automated builds](#automated-builds)** -8. **[Contributing](#contributing)** -9. **[Credits](#credits)** -10. **[License](#license)** +8. **[Automated builds](#automated-builds)** +9. **[Contributing](#contributing)** +10. **[Credits](#credits)** +11. **[License](#license)** ---- @@ -748,6 +749,20 @@ Have a look at the following table to see all offered exposed ports for each Doc +

PHP Default Configuration

+ +Each PHP version is using the same sane default php.ini values, making it pain-free to switch versions and not having to worry about different php.ini settings. +**Note:** Flavours alway inherit the settings from its parent flavour and will selectively overwrite specific settings. + +| Flavour | Applied php.ini files| +|---------|------------------------------------------| +| base | [base.ini](Dockerfiles/base/data/php.d/) | +| mods | - | +| prod | [prod.ini](Dockerfiles/prod/data/php.d/) | +| work | [work.ini](Dockerfiles/work/data/php.d/) | + + +

Integrated Development Environment

If you plan to use the PHP-FPM image for development, hence being able to execute common commands inside the container itself, you should go with the **work** Image. diff --git a/build/ansible/CONFIGURATION/php-base.ini b/build/ansible/CONFIGURATION/php-base.ini new file mode 100644 index 0000000..b3de1ec --- /dev/null +++ b/build/ansible/CONFIGURATION/php-base.ini @@ -0,0 +1,42 @@ +; ############################################################ +; # Devilbox PHP defaults for all Docker images +; ############################################################ + +; This php.ini is applied to the base container and inherited +; by every image built on top of it. +; Note that prod and work images overwrite specific settings +; for their use-case. + + +[PHP] + +; Memory +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +post_max_size = 256M +upload_max_filesize = 256M +max_file_uploads = 20 + + +; Vars +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 + + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +track_errors = On +log_errors = On diff --git a/build/ansible/CONFIGURATION/php-prod.ini b/build/ansible/CONFIGURATION/php-prod.ini new file mode 100644 index 0000000..cbbb137 --- /dev/null +++ b/build/ansible/CONFIGURATION/php-prod.ini @@ -0,0 +1,9 @@ +; ############################################################ +; # Devilbox PHP defaults for all production Docker images +; ############################################################ + +; This php.ini is applied to the prod container and inherited +; by every image built on top of it. + + +[PHP] diff --git a/build/ansible/CONFIGURATION/php-work.ini b/build/ansible/CONFIGURATION/php-work.ini new file mode 100644 index 0000000..ba7061a --- /dev/null +++ b/build/ansible/CONFIGURATION/php-work.ini @@ -0,0 +1,17 @@ +; ############################################################ +; # Devilbox PHP defaults for all development Docker images +; ############################################################ + +; This php.ini is applied to the work container. + + +[PHP] + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +display_errors = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On diff --git a/build/ansible/DOCKERFILES/Dockerfile-base.j2 b/build/ansible/DOCKERFILES/Dockerfile-base.j2 index da51ab9..606b5da 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-base.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-base.j2 @@ -62,6 +62,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-{{ php_version }}.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf diff --git a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 index 95bb84a..d3e1e1a 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 @@ -50,6 +50,7 @@ RUN set -x \ ### ### Copy files ### +COPY ./data/php.d/php-{{ php_version }}.ini /usr/local/etc/php/conf.d/yyy-devilbox-03-prod.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/postfix.sh /usr/local/sbin/postfix.sh diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index b8c6a29..9c858ef 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -191,7 +191,7 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/error-reporting.ini /usr/local/etc/php/conf.d/devilbox-error-reporting.ini +COPY ./data/php.d/php-{{ php_version }}.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index 16bd778..1668617 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -11,6 +11,15 @@ template_files: - src: DOCKERFILES/Dockerfile-work.j2 dst: "../../Dockerfiles/work/Dockerfile-{{ php_version }}" +# PHP.ini files to apply sane defaults +ini_files: + - src: CONFIGURATION/php-base.ini + dst: "../../Dockerfiles/base/data/php.d/php-{{ php_version }}.ini" + - src: CONFIGURATION/php-prod.ini + dst: "../../Dockerfiles/prod/data/php.d/php-{{ php_version }}.ini" + - src: CONFIGURATION/php-work.ini + dst: "../../Dockerfiles/work/data/php.d/php-{{ php_version }}.ini" + # Adds self-validating checks to Dockerfile # turn off for final build diff --git a/build/ansible/roles/template/tasks/main.yml b/build/ansible/roles/template/tasks/main.yml index 4d32a73..72e799f 100644 --- a/build/ansible/roles/template/tasks/main.yml +++ b/build/ansible/roles/template/tasks/main.yml @@ -2,9 +2,18 @@ - name: render template template: - src: "{{ item.src }}" + src: "{{ item.src }}" dest: "{{ item.dst }}" force: True - mode: 0644 + mode: 0644 with_items: - "{{ template_files }}" + +- name: copy php.ini configuration + copy: + src: "{{ item.src }}" + dest: "{{ item.dst }}" + force: True + mode: 0644 + with_items: + - "{{ ini_files }}"