From 523c936f6539c4b9755f6314c2f95694f879e973 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 2 Aug 2018 13:12:12 +0200 Subject: [PATCH] Make php configuration generatable via Ansible --- Dockerfiles/base/Dockerfile-5.3 | 8 +- Dockerfiles/base/Dockerfile-5.4 | 7 +- Dockerfiles/base/Dockerfile-5.5 | 7 +- Dockerfiles/base/Dockerfile-5.6 | 7 +- Dockerfiles/base/Dockerfile-7.0 | 7 +- Dockerfiles/base/Dockerfile-7.1 | 7 +- Dockerfiles/base/Dockerfile-7.2 | 7 +- Dockerfiles/base/Dockerfile-7.3 | 7 +- .../php-fpm-5.3.conf} | 0 .../base/data/php-fpm.conf/php-fpm-5.4.conf | 3 + .../base/data/php-fpm.conf/php-fpm-5.5.conf | 3 + .../base/data/php-fpm.conf/php-fpm-5.6.conf | 3 + .../base/data/php-fpm.conf/php-fpm-7.0.conf | 3 + .../base/data/php-fpm.conf/php-fpm-7.1.conf | 3 + .../base/data/php-fpm.conf/php-fpm-7.2.conf | 3 + .../base/data/php-fpm.conf/php-fpm-7.3.conf | 3 + .../base/data/php-fpm.d-docker-5.3.conf | 10 - Dockerfiles/base/data/php-fpm.d/docker.conf | 10 - Dockerfiles/base/data/php-fpm.d/listen.conf | 3 - Dockerfiles/base/data/php-fpm.d/logfiles.conf | 6 - Dockerfiles/base/data/php-fpm.d/loglevel.conf | 2 - .../base/data/php-fpm.d/php-fpm.d-5.3.conf | 98 ++++++++ .../base/data/php-fpm.d/php-fpm.d-5.4.conf | 100 ++++++++ .../base/data/php-fpm.d/php-fpm.d-5.5.conf | 100 ++++++++ .../base/data/php-fpm.d/php-fpm.d-5.6.conf | 100 ++++++++ .../base/data/php-fpm.d/php-fpm.d-7.0.conf | 100 ++++++++ .../base/data/php-fpm.d/php-fpm.d-7.1.conf | 100 ++++++++ .../base/data/php-fpm.d/php-fpm.d-7.2.conf | 99 ++++++++ .../base/data/php-fpm.d/php-fpm.d-7.3.conf | 99 ++++++++ Dockerfiles/base/data/php-fpm.d/pool.conf | 24 -- Dockerfiles/base/data/php-fpm.d/user.conf | 5 - .../data/{php.d => php-ini.d}/php-5.3.ini | 9 +- .../data/{php.d => php-ini.d}/php-5.4.ini | 9 +- .../data/{php.d => php-ini.d}/php-5.5.ini | 9 +- .../data/{php.d => php-ini.d}/php-5.6.ini | 9 +- .../data/{php.d => php-ini.d}/php-7.0.ini | 9 +- .../data/{php.d => php-ini.d}/php-7.1.ini | 9 +- .../data/{php.d => php-ini.d}/php-7.2.ini | 9 +- .../data/{php.d => php-ini.d}/php-7.3.ini | 9 +- 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 | 6 +- Dockerfiles/work/Dockerfile-5.4 | 6 +- Dockerfiles/work/Dockerfile-5.5 | 6 +- Dockerfiles/work/Dockerfile-5.6 | 6 +- Dockerfiles/work/Dockerfile-7.0 | 6 +- Dockerfiles/work/Dockerfile-7.1 | 6 +- Dockerfiles/work/Dockerfile-7.2 | 6 +- Dockerfiles/work/Dockerfile-7.3 | 6 +- .../work/data/php-fpm.conf/php-fpm-5.3.conf | 3 + .../work/data/php-fpm.conf/php-fpm-5.4.conf | 3 + .../work/data/php-fpm.conf/php-fpm-5.5.conf | 3 + .../work/data/php-fpm.conf/php-fpm-5.6.conf | 3 + .../work/data/php-fpm.conf/php-fpm-7.0.conf | 3 + .../work/data/php-fpm.conf/php-fpm-7.1.conf | 3 + .../work/data/php-fpm.conf/php-fpm-7.2.conf | 3 + .../work/data/php-fpm.conf/php-fpm-7.3.conf | 3 + .../work/data/php-fpm.d/php-fpm.d-5.3.conf | 98 ++++++++ .../work/data/php-fpm.d/php-fpm.d-5.4.conf | 100 ++++++++ .../work/data/php-fpm.d/php-fpm.d-5.5.conf | 100 ++++++++ .../work/data/php-fpm.d/php-fpm.d-5.6.conf | 100 ++++++++ .../work/data/php-fpm.d/php-fpm.d-7.0.conf | 100 ++++++++ .../work/data/php-fpm.d/php-fpm.d-7.1.conf | 100 ++++++++ .../work/data/php-fpm.d/php-fpm.d-7.2.conf | 99 ++++++++ .../work/data/php-fpm.d/php-fpm.d-7.3.conf | 99 ++++++++ Dockerfiles/work/data/php-ini.d/php-5.3.ini | 42 ++++ Dockerfiles/work/data/php-ini.d/php-5.4.ini | 43 ++++ Dockerfiles/work/data/php-ini.d/php-5.5.ini | 43 ++++ Dockerfiles/work/data/php-ini.d/php-5.6.ini | 43 ++++ Dockerfiles/work/data/php-ini.d/php-7.0.ini | 43 ++++ Dockerfiles/work/data/php-ini.d/php-7.1.ini | 43 ++++ Dockerfiles/work/data/php-ini.d/php-7.2.ini | 42 ++++ Dockerfiles/work/data/php-ini.d/php-7.3.ini | 42 ++++ 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 | 16 -- Dockerfiles/work/data/php.d/php-7.3.ini | 16 -- build/ansible/CONFIGURATION/php-base.ini.j2 | 48 ---- build/ansible/CONFIGURATION/php-prod.ini.j2 | 9 - build/ansible/CONFIGURATION/php-work.ini.j2 | 19 -- build/ansible/CONFIGURATIONS/php-fpm.conf.j2 | 163 ++++++++++++ .../ansible/CONFIGURATIONS/php-fpm.d-conf.j2 | 110 +++++++++ build/ansible/CONFIGURATIONS/php.ini.j2 | 49 ++++ build/ansible/DOCKERFILES/Dockerfile-base.j2 | 14 +- build/ansible/DOCKERFILES/Dockerfile-prod.j2 | 1 - build/ansible/DOCKERFILES/Dockerfile-work.j2 | 6 +- build/ansible/group_vars/all.yml | 232 ++++++++++++++++-- build/ansible/roles/template/tasks/main.yml | 8 +- 106 files changed, 2626 insertions(+), 462 deletions(-) rename Dockerfiles/base/data/{php-fpm.conf => php-fpm.conf/php-fpm-5.3.conf} (100%) create mode 100644 Dockerfiles/base/data/php-fpm.conf/php-fpm-5.4.conf create mode 100644 Dockerfiles/base/data/php-fpm.conf/php-fpm-5.5.conf create mode 100644 Dockerfiles/base/data/php-fpm.conf/php-fpm-5.6.conf create mode 100644 Dockerfiles/base/data/php-fpm.conf/php-fpm-7.0.conf create mode 100644 Dockerfiles/base/data/php-fpm.conf/php-fpm-7.1.conf create mode 100644 Dockerfiles/base/data/php-fpm.conf/php-fpm-7.2.conf create mode 100644 Dockerfiles/base/data/php-fpm.conf/php-fpm-7.3.conf delete mode 100644 Dockerfiles/base/data/php-fpm.d-docker-5.3.conf delete mode 100644 Dockerfiles/base/data/php-fpm.d/docker.conf delete mode 100644 Dockerfiles/base/data/php-fpm.d/listen.conf delete mode 100644 Dockerfiles/base/data/php-fpm.d/logfiles.conf delete mode 100644 Dockerfiles/base/data/php-fpm.d/loglevel.conf create mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.3.conf create mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.4.conf create mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.5.conf create mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.6.conf create mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.0.conf create mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.1.conf create mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.2.conf create mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.3.conf delete mode 100644 Dockerfiles/base/data/php-fpm.d/pool.conf delete mode 100644 Dockerfiles/base/data/php-fpm.d/user.conf rename Dockerfiles/base/data/{php.d => php-ini.d}/php-5.3.ini (79%) rename Dockerfiles/base/data/{php.d => php-ini.d}/php-5.4.ini (80%) rename Dockerfiles/base/data/{php.d => php-ini.d}/php-5.5.ini (80%) rename Dockerfiles/base/data/{php.d => php-ini.d}/php-5.6.ini (80%) rename Dockerfiles/base/data/{php.d => php-ini.d}/php-7.0.ini (80%) rename Dockerfiles/base/data/{php.d => php-ini.d}/php-7.1.ini (80%) rename Dockerfiles/base/data/{php.d => php-ini.d}/php-7.2.ini (79%) rename Dockerfiles/base/data/{php.d => php-ini.d}/php-7.3.ini (79%) delete mode 100644 Dockerfiles/prod/data/php.d/php-5.3.ini delete mode 100644 Dockerfiles/prod/data/php.d/php-5.4.ini delete mode 100644 Dockerfiles/prod/data/php.d/php-5.5.ini delete mode 100644 Dockerfiles/prod/data/php.d/php-5.6.ini delete mode 100644 Dockerfiles/prod/data/php.d/php-7.0.ini delete mode 100644 Dockerfiles/prod/data/php.d/php-7.1.ini delete mode 100644 Dockerfiles/prod/data/php.d/php-7.2.ini delete mode 100644 Dockerfiles/prod/data/php.d/php-7.3.ini create mode 100644 Dockerfiles/work/data/php-fpm.conf/php-fpm-5.3.conf create mode 100644 Dockerfiles/work/data/php-fpm.conf/php-fpm-5.4.conf create mode 100644 Dockerfiles/work/data/php-fpm.conf/php-fpm-5.5.conf create mode 100644 Dockerfiles/work/data/php-fpm.conf/php-fpm-5.6.conf create mode 100644 Dockerfiles/work/data/php-fpm.conf/php-fpm-7.0.conf create mode 100644 Dockerfiles/work/data/php-fpm.conf/php-fpm-7.1.conf create mode 100644 Dockerfiles/work/data/php-fpm.conf/php-fpm-7.2.conf create mode 100644 Dockerfiles/work/data/php-fpm.conf/php-fpm-7.3.conf create mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.3.conf create mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.4.conf create mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.5.conf create mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.6.conf create mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.0.conf create mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.1.conf create mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.2.conf create mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.3.conf create mode 100644 Dockerfiles/work/data/php-ini.d/php-5.3.ini create mode 100644 Dockerfiles/work/data/php-ini.d/php-5.4.ini create mode 100644 Dockerfiles/work/data/php-ini.d/php-5.5.ini create mode 100644 Dockerfiles/work/data/php-ini.d/php-5.6.ini create mode 100644 Dockerfiles/work/data/php-ini.d/php-7.0.ini create mode 100644 Dockerfiles/work/data/php-ini.d/php-7.1.ini create mode 100644 Dockerfiles/work/data/php-ini.d/php-7.2.ini create mode 100644 Dockerfiles/work/data/php-ini.d/php-7.3.ini delete mode 100644 Dockerfiles/work/data/php.d/php-5.3.ini delete mode 100644 Dockerfiles/work/data/php.d/php-5.4.ini delete mode 100644 Dockerfiles/work/data/php.d/php-5.5.ini delete mode 100644 Dockerfiles/work/data/php.d/php-5.6.ini delete mode 100644 Dockerfiles/work/data/php.d/php-7.0.ini delete mode 100644 Dockerfiles/work/data/php.d/php-7.1.ini delete mode 100644 Dockerfiles/work/data/php.d/php-7.2.ini delete mode 100644 Dockerfiles/work/data/php.d/php-7.3.ini delete mode 100644 build/ansible/CONFIGURATION/php-base.ini.j2 delete mode 100644 build/ansible/CONFIGURATION/php-prod.ini.j2 delete mode 100644 build/ansible/CONFIGURATION/php-work.ini.j2 create mode 100644 build/ansible/CONFIGURATIONS/php-fpm.conf.j2 create mode 100644 build/ansible/CONFIGURATIONS/php-fpm.d-conf.j2 create mode 100644 build/ansible/CONFIGURATIONS/php.ini.j2 diff --git a/Dockerfiles/base/Dockerfile-5.3 b/Dockerfiles/base/Dockerfile-5.3 index f1f19ae..3099e99 100644 --- a/Dockerfiles/base/Dockerfile-5.3 +++ b/Dockerfiles/base/Dockerfile-5.3 @@ -56,12 +56,12 @@ 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/php-ini.d/php-5.3.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-5.3.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-5.3.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + 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 -COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d -COPY ./data/php-fpm.d-docker-5.3.conf /usr/local/etc/php-fpm.d/docker.conf ### diff --git a/Dockerfiles/base/Dockerfile-5.4 b/Dockerfiles/base/Dockerfile-5.4 index 167f919..444663b 100644 --- a/Dockerfiles/base/Dockerfile-5.4 +++ b/Dockerfiles/base/Dockerfile-5.4 @@ -56,11 +56,12 @@ 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/php-ini.d/php-5.4.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-5.4.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-5.4.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + 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 -COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d ### diff --git a/Dockerfiles/base/Dockerfile-5.5 b/Dockerfiles/base/Dockerfile-5.5 index d184f9a..276c022 100644 --- a/Dockerfiles/base/Dockerfile-5.5 +++ b/Dockerfiles/base/Dockerfile-5.5 @@ -56,11 +56,12 @@ 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/php-ini.d/php-5.5.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-5.5.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-5.5.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + 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 -COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d ### diff --git a/Dockerfiles/base/Dockerfile-5.6 b/Dockerfiles/base/Dockerfile-5.6 index 71c9f4b..5893221 100644 --- a/Dockerfiles/base/Dockerfile-5.6 +++ b/Dockerfiles/base/Dockerfile-5.6 @@ -56,11 +56,12 @@ 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/php-ini.d/php-5.6.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-5.6.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-5.6.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + 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 -COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d ### diff --git a/Dockerfiles/base/Dockerfile-7.0 b/Dockerfiles/base/Dockerfile-7.0 index 5430c30..b213de2 100644 --- a/Dockerfiles/base/Dockerfile-7.0 +++ b/Dockerfiles/base/Dockerfile-7.0 @@ -56,11 +56,12 @@ 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/php-ini.d/php-7.0.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-7.0.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-7.0.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + 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 -COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d ### diff --git a/Dockerfiles/base/Dockerfile-7.1 b/Dockerfiles/base/Dockerfile-7.1 index 9a267cd..f4a8bc7 100644 --- a/Dockerfiles/base/Dockerfile-7.1 +++ b/Dockerfiles/base/Dockerfile-7.1 @@ -56,11 +56,12 @@ 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/php-ini.d/php-7.1.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-7.1.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-7.1.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + 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 -COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d ### diff --git a/Dockerfiles/base/Dockerfile-7.2 b/Dockerfiles/base/Dockerfile-7.2 index 381de2f..c34d6a5 100644 --- a/Dockerfiles/base/Dockerfile-7.2 +++ b/Dockerfiles/base/Dockerfile-7.2 @@ -56,11 +56,12 @@ 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/php-ini.d/php-7.2.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-7.2.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-7.2.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + 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 -COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d ### diff --git a/Dockerfiles/base/Dockerfile-7.3 b/Dockerfiles/base/Dockerfile-7.3 index aa82ff0..87cb9e9 100644 --- a/Dockerfiles/base/Dockerfile-7.3 +++ b/Dockerfiles/base/Dockerfile-7.3 @@ -56,11 +56,12 @@ 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/php-ini.d/php-7.3.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-7.3.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-7.3.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + 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 -COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d ### diff --git a/Dockerfiles/base/data/php-fpm.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.3.conf similarity index 100% rename from Dockerfiles/base/data/php-fpm.conf rename to Dockerfiles/base/data/php-fpm.conf/php-fpm-5.3.conf diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.4.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.4.conf new file mode 100644 index 0000000..370fe70 --- /dev/null +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.4.conf @@ -0,0 +1,3 @@ +[global] +daemonize = no +include = /usr/local/etc/php-fpm.d/*.conf diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.5.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.5.conf new file mode 100644 index 0000000..370fe70 --- /dev/null +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.5.conf @@ -0,0 +1,3 @@ +[global] +daemonize = no +include = /usr/local/etc/php-fpm.d/*.conf diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.6.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.6.conf new file mode 100644 index 0000000..370fe70 --- /dev/null +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.6.conf @@ -0,0 +1,3 @@ +[global] +daemonize = no +include = /usr/local/etc/php-fpm.d/*.conf diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.0.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.0.conf new file mode 100644 index 0000000..370fe70 --- /dev/null +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.0.conf @@ -0,0 +1,3 @@ +[global] +daemonize = no +include = /usr/local/etc/php-fpm.d/*.conf diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.1.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.1.conf new file mode 100644 index 0000000..370fe70 --- /dev/null +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.1.conf @@ -0,0 +1,3 @@ +[global] +daemonize = no +include = /usr/local/etc/php-fpm.d/*.conf diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.2.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.2.conf new file mode 100644 index 0000000..370fe70 --- /dev/null +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.2.conf @@ -0,0 +1,3 @@ +[global] +daemonize = no +include = /usr/local/etc/php-fpm.d/*.conf diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.3.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.3.conf new file mode 100644 index 0000000..370fe70 --- /dev/null +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.3.conf @@ -0,0 +1,3 @@ +[global] +daemonize = no +include = /usr/local/etc/php-fpm.d/*.conf diff --git a/Dockerfiles/base/data/php-fpm.d-docker-5.3.conf b/Dockerfiles/base/data/php-fpm.d-docker-5.3.conf deleted file mode 100644 index 3e5b3fc..0000000 --- a/Dockerfiles/base/data/php-fpm.d-docker-5.3.conf +++ /dev/null @@ -1,10 +0,0 @@ -[www] -; Keep env variables set by docker -;clear_env = no - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes diff --git a/Dockerfiles/base/data/php-fpm.d/docker.conf b/Dockerfiles/base/data/php-fpm.d/docker.conf deleted file mode 100644 index 2dc750f..0000000 --- a/Dockerfiles/base/data/php-fpm.d/docker.conf +++ /dev/null @@ -1,10 +0,0 @@ -[www] -; Keep env variables set by docker -clear_env = no - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes diff --git a/Dockerfiles/base/data/php-fpm.d/listen.conf b/Dockerfiles/base/data/php-fpm.d/listen.conf deleted file mode 100644 index 6972812..0000000 --- a/Dockerfiles/base/data/php-fpm.d/listen.conf +++ /dev/null @@ -1,3 +0,0 @@ -[www] -; Ensure to listen here -listen = 9000 diff --git a/Dockerfiles/base/data/php-fpm.d/logfiles.conf b/Dockerfiles/base/data/php-fpm.d/logfiles.conf deleted file mode 100644 index 554fd2e..0000000 --- a/Dockerfiles/base/data/php-fpm.d/logfiles.conf +++ /dev/null @@ -1,6 +0,0 @@ -[global] -error_log = /proc/self/fd/2 - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 diff --git a/Dockerfiles/base/data/php-fpm.d/loglevel.conf b/Dockerfiles/base/data/php-fpm.d/loglevel.conf deleted file mode 100644 index fa63f95..0000000 --- a/Dockerfiles/base/data/php-fpm.d/loglevel.conf +++ /dev/null @@ -1,2 +0,0 @@ -[global] -log_level = notice diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.3.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.3.conf new file mode 100644 index 0000000..b99b2de --- /dev/null +++ b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.3.conf @@ -0,0 +1,98 @@ +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1023 + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 180s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = dynamic + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 10 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 15 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +php_flag[xmlrpc_errors] = Off +php_flag[report_memleaks] = On +php_flag[display_errors] = Off +php_flag[display_startup_errors] = Off +php_flag[track_errors] = On +php_flag[log_errors] = On +php_flag[html_errors] = Off diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.4.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.4.conf new file mode 100644 index 0000000..6ed8472 --- /dev/null +++ b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.4.conf @@ -0,0 +1,100 @@ +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1023 + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 180s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = dynamic + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 10 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 15 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +php_flag[xmlrpc_errors] = Off +php_flag[report_memleaks] = On +php_flag[display_errors] = Off +php_flag[display_startup_errors] = Off +php_flag[track_errors] = On +php_flag[log_errors] = On +php_flag[html_errors] = Off diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.5.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.5.conf new file mode 100644 index 0000000..6ed8472 --- /dev/null +++ b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.5.conf @@ -0,0 +1,100 @@ +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1023 + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 180s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = dynamic + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 10 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 15 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +php_flag[xmlrpc_errors] = Off +php_flag[report_memleaks] = On +php_flag[display_errors] = Off +php_flag[display_startup_errors] = Off +php_flag[track_errors] = On +php_flag[log_errors] = On +php_flag[html_errors] = Off diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.6.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.6.conf new file mode 100644 index 0000000..6ed8472 --- /dev/null +++ b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.6.conf @@ -0,0 +1,100 @@ +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1023 + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 180s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = dynamic + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 10 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 15 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +php_flag[xmlrpc_errors] = Off +php_flag[report_memleaks] = On +php_flag[display_errors] = Off +php_flag[display_startup_errors] = Off +php_flag[track_errors] = On +php_flag[log_errors] = On +php_flag[html_errors] = Off diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.0.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.0.conf new file mode 100644 index 0000000..6ed8472 --- /dev/null +++ b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.0.conf @@ -0,0 +1,100 @@ +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1023 + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 180s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = dynamic + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 10 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 15 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +php_flag[xmlrpc_errors] = Off +php_flag[report_memleaks] = On +php_flag[display_errors] = Off +php_flag[display_startup_errors] = Off +php_flag[track_errors] = On +php_flag[log_errors] = On +php_flag[html_errors] = Off diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.1.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.1.conf new file mode 100644 index 0000000..6ed8472 --- /dev/null +++ b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.1.conf @@ -0,0 +1,100 @@ +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1023 + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 180s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = dynamic + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 10 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 15 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +php_flag[xmlrpc_errors] = Off +php_flag[report_memleaks] = On +php_flag[display_errors] = Off +php_flag[display_startup_errors] = Off +php_flag[track_errors] = On +php_flag[log_errors] = On +php_flag[html_errors] = Off diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.2.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.2.conf new file mode 100644 index 0000000..ebff256 --- /dev/null +++ b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.2.conf @@ -0,0 +1,99 @@ +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1023 + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 180s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = dynamic + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 10 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 15 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +php_flag[xmlrpc_errors] = Off +php_flag[report_memleaks] = On +php_flag[display_errors] = Off +php_flag[display_startup_errors] = Off +php_flag[log_errors] = On +php_flag[html_errors] = Off diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.3.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.3.conf new file mode 100644 index 0000000..ebff256 --- /dev/null +++ b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.3.conf @@ -0,0 +1,99 @@ +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1023 + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 180s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = dynamic + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 10 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 15 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +php_flag[xmlrpc_errors] = Off +php_flag[report_memleaks] = On +php_flag[display_errors] = Off +php_flag[display_startup_errors] = Off +php_flag[log_errors] = On +php_flag[html_errors] = Off diff --git a/Dockerfiles/base/data/php-fpm.d/pool.conf b/Dockerfiles/base/data/php-fpm.d/pool.conf deleted file mode 100644 index 79f9d87..0000000 --- a/Dockerfiles/base/data/php-fpm.d/pool.conf +++ /dev/null @@ -1,24 +0,0 @@ -[www] - -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 diff --git a/Dockerfiles/base/data/php-fpm.d/user.conf b/Dockerfiles/base/data/php-fpm.d/user.conf deleted file mode 100644 index bbc2b16..0000000 --- a/Dockerfiles/base/data/php-fpm.d/user.conf +++ /dev/null @@ -1,5 +0,0 @@ -[www] - -; User and Group -user = devilbox -group = devilbox diff --git a/Dockerfiles/base/data/php.d/php-5.3.ini b/Dockerfiles/base/data/php-ini.d/php-5.3.ini similarity index 79% rename from Dockerfiles/base/data/php.d/php-5.3.ini rename to Dockerfiles/base/data/php-ini.d/php-5.3.ini index ed6a2bf..6978458 100644 --- a/Dockerfiles/base/data/php.d/php-5.3.ini +++ b/Dockerfiles/base/data/php-ini.d/php-5.3.ini @@ -1,11 +1,9 @@ ; ############################################################ -; # Devilbox PHP defaults for all Docker images +; # Devilbox PHP defaults for 5.3-base ; ############################################################ -; 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. +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. [PHP] @@ -41,3 +39,4 @@ display_errors = Off display_startup_errors = Off track_errors = On log_errors = On +html_errors = Off diff --git a/Dockerfiles/base/data/php.d/php-5.4.ini b/Dockerfiles/base/data/php-ini.d/php-5.4.ini similarity index 80% rename from Dockerfiles/base/data/php.d/php-5.4.ini rename to Dockerfiles/base/data/php-ini.d/php-5.4.ini index 0d1ed60..321d0ac 100644 --- a/Dockerfiles/base/data/php.d/php-5.4.ini +++ b/Dockerfiles/base/data/php-ini.d/php-5.4.ini @@ -1,11 +1,9 @@ ; ############################################################ -; # Devilbox PHP defaults for all Docker images +; # Devilbox PHP defaults for 5.4-base ; ############################################################ -; 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. +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. [PHP] @@ -42,3 +40,4 @@ display_errors = Off display_startup_errors = Off track_errors = On log_errors = On +html_errors = Off diff --git a/Dockerfiles/base/data/php.d/php-5.5.ini b/Dockerfiles/base/data/php-ini.d/php-5.5.ini similarity index 80% rename from Dockerfiles/base/data/php.d/php-5.5.ini rename to Dockerfiles/base/data/php-ini.d/php-5.5.ini index 0d1ed60..759543f 100644 --- a/Dockerfiles/base/data/php.d/php-5.5.ini +++ b/Dockerfiles/base/data/php-ini.d/php-5.5.ini @@ -1,11 +1,9 @@ ; ############################################################ -; # Devilbox PHP defaults for all Docker images +; # Devilbox PHP defaults for 5.5-base ; ############################################################ -; 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. +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. [PHP] @@ -42,3 +40,4 @@ display_errors = Off display_startup_errors = Off track_errors = On log_errors = On +html_errors = Off diff --git a/Dockerfiles/base/data/php.d/php-5.6.ini b/Dockerfiles/base/data/php-ini.d/php-5.6.ini similarity index 80% rename from Dockerfiles/base/data/php.d/php-5.6.ini rename to Dockerfiles/base/data/php-ini.d/php-5.6.ini index 0d1ed60..c923580 100644 --- a/Dockerfiles/base/data/php.d/php-5.6.ini +++ b/Dockerfiles/base/data/php-ini.d/php-5.6.ini @@ -1,11 +1,9 @@ ; ############################################################ -; # Devilbox PHP defaults for all Docker images +; # Devilbox PHP defaults for 5.6-base ; ############################################################ -; 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. +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. [PHP] @@ -42,3 +40,4 @@ display_errors = Off display_startup_errors = Off track_errors = On log_errors = On +html_errors = Off diff --git a/Dockerfiles/base/data/php.d/php-7.0.ini b/Dockerfiles/base/data/php-ini.d/php-7.0.ini similarity index 80% rename from Dockerfiles/base/data/php.d/php-7.0.ini rename to Dockerfiles/base/data/php-ini.d/php-7.0.ini index 0d1ed60..443affb 100644 --- a/Dockerfiles/base/data/php.d/php-7.0.ini +++ b/Dockerfiles/base/data/php-ini.d/php-7.0.ini @@ -1,11 +1,9 @@ ; ############################################################ -; # Devilbox PHP defaults for all Docker images +; # Devilbox PHP defaults for 7.0-base ; ############################################################ -; 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. +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. [PHP] @@ -42,3 +40,4 @@ display_errors = Off display_startup_errors = Off track_errors = On log_errors = On +html_errors = Off diff --git a/Dockerfiles/base/data/php.d/php-7.1.ini b/Dockerfiles/base/data/php-ini.d/php-7.1.ini similarity index 80% rename from Dockerfiles/base/data/php.d/php-7.1.ini rename to Dockerfiles/base/data/php-ini.d/php-7.1.ini index 0d1ed60..2e6f49f 100644 --- a/Dockerfiles/base/data/php.d/php-7.1.ini +++ b/Dockerfiles/base/data/php-ini.d/php-7.1.ini @@ -1,11 +1,9 @@ ; ############################################################ -; # Devilbox PHP defaults for all Docker images +; # Devilbox PHP defaults for 7.1-base ; ############################################################ -; 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. +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. [PHP] @@ -42,3 +40,4 @@ display_errors = Off display_startup_errors = Off track_errors = On log_errors = On +html_errors = Off diff --git a/Dockerfiles/base/data/php.d/php-7.2.ini b/Dockerfiles/base/data/php-ini.d/php-7.2.ini similarity index 79% rename from Dockerfiles/base/data/php.d/php-7.2.ini rename to Dockerfiles/base/data/php-ini.d/php-7.2.ini index 6eba34e..c50b1a2 100644 --- a/Dockerfiles/base/data/php.d/php-7.2.ini +++ b/Dockerfiles/base/data/php-ini.d/php-7.2.ini @@ -1,11 +1,9 @@ ; ############################################################ -; # Devilbox PHP defaults for all Docker images +; # Devilbox PHP defaults for 7.2-base ; ############################################################ -; 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. +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. [PHP] @@ -41,3 +39,4 @@ report_memleaks = On display_errors = Off display_startup_errors = Off log_errors = On +html_errors = Off diff --git a/Dockerfiles/base/data/php.d/php-7.3.ini b/Dockerfiles/base/data/php-ini.d/php-7.3.ini similarity index 79% rename from Dockerfiles/base/data/php.d/php-7.3.ini rename to Dockerfiles/base/data/php-ini.d/php-7.3.ini index 6eba34e..75132c6 100644 --- a/Dockerfiles/base/data/php.d/php-7.3.ini +++ b/Dockerfiles/base/data/php-ini.d/php-7.3.ini @@ -1,11 +1,9 @@ ; ############################################################ -; # Devilbox PHP defaults for all Docker images +; # Devilbox PHP defaults for 7.3-base ; ############################################################ -; 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. +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. [PHP] @@ -41,3 +39,4 @@ report_memleaks = On display_errors = Off display_startup_errors = Off log_errors = On +html_errors = Off diff --git a/Dockerfiles/prod/Dockerfile-5.3 b/Dockerfiles/prod/Dockerfile-5.3 index 2daac92..c518baa 100644 --- a/Dockerfiles/prod/Dockerfile-5.3 +++ b/Dockerfiles/prod/Dockerfile-5.3 @@ -48,7 +48,6 @@ 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 e4214c2..8ae6806 100644 --- a/Dockerfiles/prod/Dockerfile-5.4 +++ b/Dockerfiles/prod/Dockerfile-5.4 @@ -48,7 +48,6 @@ 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 d6bee4b..df204b8 100644 --- a/Dockerfiles/prod/Dockerfile-5.5 +++ b/Dockerfiles/prod/Dockerfile-5.5 @@ -48,7 +48,6 @@ 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 4a86296..c920672 100644 --- a/Dockerfiles/prod/Dockerfile-5.6 +++ b/Dockerfiles/prod/Dockerfile-5.6 @@ -48,7 +48,6 @@ 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 35e4688..6d61515 100644 --- a/Dockerfiles/prod/Dockerfile-7.0 +++ b/Dockerfiles/prod/Dockerfile-7.0 @@ -48,7 +48,6 @@ 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 1e8a5cd..ee4d98b 100644 --- a/Dockerfiles/prod/Dockerfile-7.1 +++ b/Dockerfiles/prod/Dockerfile-7.1 @@ -48,7 +48,6 @@ 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 3dd8eb5..bae41cd 100644 --- a/Dockerfiles/prod/Dockerfile-7.2 +++ b/Dockerfiles/prod/Dockerfile-7.2 @@ -48,7 +48,6 @@ 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 91c6236..7beefbb 100644 --- a/Dockerfiles/prod/Dockerfile-7.3 +++ b/Dockerfiles/prod/Dockerfile-7.3 @@ -48,7 +48,6 @@ 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 deleted file mode 100644 index cbbb137..0000000 --- a/Dockerfiles/prod/data/php.d/php-5.3.ini +++ /dev/null @@ -1,9 +0,0 @@ -; ############################################################ -; # 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 deleted file mode 100644 index cbbb137..0000000 --- a/Dockerfiles/prod/data/php.d/php-5.4.ini +++ /dev/null @@ -1,9 +0,0 @@ -; ############################################################ -; # 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 deleted file mode 100644 index cbbb137..0000000 --- a/Dockerfiles/prod/data/php.d/php-5.5.ini +++ /dev/null @@ -1,9 +0,0 @@ -; ############################################################ -; # 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 deleted file mode 100644 index cbbb137..0000000 --- a/Dockerfiles/prod/data/php.d/php-5.6.ini +++ /dev/null @@ -1,9 +0,0 @@ -; ############################################################ -; # 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 deleted file mode 100644 index cbbb137..0000000 --- a/Dockerfiles/prod/data/php.d/php-7.0.ini +++ /dev/null @@ -1,9 +0,0 @@ -; ############################################################ -; # 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 deleted file mode 100644 index cbbb137..0000000 --- a/Dockerfiles/prod/data/php.d/php-7.1.ini +++ /dev/null @@ -1,9 +0,0 @@ -; ############################################################ -; # 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 deleted file mode 100644 index cbbb137..0000000 --- a/Dockerfiles/prod/data/php.d/php-7.2.ini +++ /dev/null @@ -1,9 +0,0 @@ -; ############################################################ -; # 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 deleted file mode 100644 index cbbb137..0000000 --- a/Dockerfiles/prod/data/php.d/php-7.3.ini +++ /dev/null @@ -1,9 +0,0 @@ -; ############################################################ -; # 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 56ec597..210dca5 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -310,13 +310,17 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/php-5.3.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini +COPY ./data/php-ini.d/php-5.3.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-5.3.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-5.3.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox + ### ### Volumes ### diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 83046b2..b9fdc9b 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -325,13 +325,17 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/php-5.4.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini +COPY ./data/php-ini.d/php-5.4.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-5.4.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-5.4.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox + ### ### Volumes ### diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 746220f..2332ec9 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -334,13 +334,17 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/php-5.5.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini +COPY ./data/php-ini.d/php-5.5.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-5.5.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-5.5.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox + ### ### Volumes ### diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 759a1a5..ba33538 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -334,13 +334,17 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/php-5.6.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini +COPY ./data/php-ini.d/php-5.6.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-5.6.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-5.6.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox + ### ### Volumes ### diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 78c4bd5..88e825b 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -334,13 +334,17 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/php-7.0.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini +COPY ./data/php-ini.d/php-7.0.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-7.0.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-7.0.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox + ### ### Volumes ### diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 7303731..3914d4b 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -334,13 +334,17 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/php-7.1.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini +COPY ./data/php-ini.d/php-7.1.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-7.1.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-7.1.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox + ### ### Volumes ### diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 0035cf5..e26e4ba 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -334,13 +334,17 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/php-7.2.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini +COPY ./data/php-ini.d/php-7.2.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-7.2.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-7.2.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox + ### ### Volumes ### diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index e8e3c23..9713a1a 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -322,13 +322,17 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/php-7.3.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini +COPY ./data/php-ini.d/php-7.3.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-7.3.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-7.3.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox + ### ### Volumes ### diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.3.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.3.conf new file mode 100644 index 0000000..370fe70 --- /dev/null +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.3.conf @@ -0,0 +1,3 @@ +[global] +daemonize = no +include = /usr/local/etc/php-fpm.d/*.conf diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.4.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.4.conf new file mode 100644 index 0000000..370fe70 --- /dev/null +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.4.conf @@ -0,0 +1,3 @@ +[global] +daemonize = no +include = /usr/local/etc/php-fpm.d/*.conf diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.5.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.5.conf new file mode 100644 index 0000000..370fe70 --- /dev/null +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.5.conf @@ -0,0 +1,3 @@ +[global] +daemonize = no +include = /usr/local/etc/php-fpm.d/*.conf diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.6.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.6.conf new file mode 100644 index 0000000..370fe70 --- /dev/null +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.6.conf @@ -0,0 +1,3 @@ +[global] +daemonize = no +include = /usr/local/etc/php-fpm.d/*.conf diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.0.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.0.conf new file mode 100644 index 0000000..370fe70 --- /dev/null +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.0.conf @@ -0,0 +1,3 @@ +[global] +daemonize = no +include = /usr/local/etc/php-fpm.d/*.conf diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.1.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.1.conf new file mode 100644 index 0000000..370fe70 --- /dev/null +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.1.conf @@ -0,0 +1,3 @@ +[global] +daemonize = no +include = /usr/local/etc/php-fpm.d/*.conf diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.2.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.2.conf new file mode 100644 index 0000000..370fe70 --- /dev/null +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.2.conf @@ -0,0 +1,3 @@ +[global] +daemonize = no +include = /usr/local/etc/php-fpm.d/*.conf diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.3.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.3.conf new file mode 100644 index 0000000..370fe70 --- /dev/null +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.3.conf @@ -0,0 +1,3 @@ +[global] +daemonize = no +include = /usr/local/etc/php-fpm.d/*.conf diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.3.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.3.conf new file mode 100644 index 0000000..325c0e4 --- /dev/null +++ b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.3.conf @@ -0,0 +1,98 @@ +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1023 + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 180s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = dynamic + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 10 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 15 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +php_flag[xmlrpc_errors] = Off +php_flag[report_memleaks] = On +php_flag[display_errors] = On +php_flag[display_startup_errors] = On +php_flag[track_errors] = On +php_flag[log_errors] = On +php_flag[html_errors] = On diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.4.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.4.conf new file mode 100644 index 0000000..9ba572b --- /dev/null +++ b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.4.conf @@ -0,0 +1,100 @@ +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1023 + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 180s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = dynamic + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 10 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 15 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +php_flag[xmlrpc_errors] = Off +php_flag[report_memleaks] = On +php_flag[display_errors] = On +php_flag[display_startup_errors] = On +php_flag[track_errors] = On +php_flag[log_errors] = On +php_flag[html_errors] = On diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.5.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.5.conf new file mode 100644 index 0000000..9ba572b --- /dev/null +++ b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.5.conf @@ -0,0 +1,100 @@ +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1023 + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 180s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = dynamic + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 10 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 15 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +php_flag[xmlrpc_errors] = Off +php_flag[report_memleaks] = On +php_flag[display_errors] = On +php_flag[display_startup_errors] = On +php_flag[track_errors] = On +php_flag[log_errors] = On +php_flag[html_errors] = On diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.6.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.6.conf new file mode 100644 index 0000000..9ba572b --- /dev/null +++ b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.6.conf @@ -0,0 +1,100 @@ +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1023 + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 180s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = dynamic + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 10 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 15 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +php_flag[xmlrpc_errors] = Off +php_flag[report_memleaks] = On +php_flag[display_errors] = On +php_flag[display_startup_errors] = On +php_flag[track_errors] = On +php_flag[log_errors] = On +php_flag[html_errors] = On diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.0.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.0.conf new file mode 100644 index 0000000..9ba572b --- /dev/null +++ b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.0.conf @@ -0,0 +1,100 @@ +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1023 + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 180s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = dynamic + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 10 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 15 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +php_flag[xmlrpc_errors] = Off +php_flag[report_memleaks] = On +php_flag[display_errors] = On +php_flag[display_startup_errors] = On +php_flag[track_errors] = On +php_flag[log_errors] = On +php_flag[html_errors] = On diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.1.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.1.conf new file mode 100644 index 0000000..9ba572b --- /dev/null +++ b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.1.conf @@ -0,0 +1,100 @@ +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1023 + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 180s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = dynamic + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 10 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 15 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +php_flag[xmlrpc_errors] = Off +php_flag[report_memleaks] = On +php_flag[display_errors] = On +php_flag[display_startup_errors] = On +php_flag[track_errors] = On +php_flag[log_errors] = On +php_flag[html_errors] = On diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.2.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.2.conf new file mode 100644 index 0000000..5494b4b --- /dev/null +++ b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.2.conf @@ -0,0 +1,99 @@ +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1023 + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 180s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = dynamic + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 10 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 15 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +php_flag[xmlrpc_errors] = Off +php_flag[report_memleaks] = On +php_flag[display_errors] = On +php_flag[display_startup_errors] = On +php_flag[log_errors] = On +php_flag[html_errors] = On diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.3.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.3.conf new file mode 100644 index 0000000..5494b4b --- /dev/null +++ b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.3.conf @@ -0,0 +1,99 @@ +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1023 + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 180s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = dynamic + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 10 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 15 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +php_flag[xmlrpc_errors] = Off +php_flag[report_memleaks] = On +php_flag[display_errors] = On +php_flag[display_startup_errors] = On +php_flag[log_errors] = On +php_flag[html_errors] = On diff --git a/Dockerfiles/work/data/php-ini.d/php-5.3.ini b/Dockerfiles/work/data/php-ini.d/php-5.3.ini new file mode 100644 index 0000000..2683937 --- /dev/null +++ b/Dockerfiles/work/data/php-ini.d/php-5.3.ini @@ -0,0 +1,42 @@ +; ############################################################ +; # Devilbox PHP defaults for 5.3-work +; ############################################################ + +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. + + +[PHP] + +; Memory +; Note: "memory_limit" should be larger than "post_max_size" +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M +upload_max_filesize = 256M +max_file_uploads = 20 + + +; Vars +variables_order = EGPCS +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 = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On diff --git a/Dockerfiles/work/data/php-ini.d/php-5.4.ini b/Dockerfiles/work/data/php-ini.d/php-5.4.ini new file mode 100644 index 0000000..2360741 --- /dev/null +++ b/Dockerfiles/work/data/php-ini.d/php-5.4.ini @@ -0,0 +1,43 @@ +; ############################################################ +; # Devilbox PHP defaults for 5.4-work +; ############################################################ + +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. + + +[PHP] + +; Memory +; Note: "memory_limit" should be larger than "post_max_size" +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M +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 = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On diff --git a/Dockerfiles/work/data/php-ini.d/php-5.5.ini b/Dockerfiles/work/data/php-ini.d/php-5.5.ini new file mode 100644 index 0000000..b2d9415 --- /dev/null +++ b/Dockerfiles/work/data/php-ini.d/php-5.5.ini @@ -0,0 +1,43 @@ +; ############################################################ +; # Devilbox PHP defaults for 5.5-work +; ############################################################ + +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. + + +[PHP] + +; Memory +; Note: "memory_limit" should be larger than "post_max_size" +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M +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 = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On diff --git a/Dockerfiles/work/data/php-ini.d/php-5.6.ini b/Dockerfiles/work/data/php-ini.d/php-5.6.ini new file mode 100644 index 0000000..539150d --- /dev/null +++ b/Dockerfiles/work/data/php-ini.d/php-5.6.ini @@ -0,0 +1,43 @@ +; ############################################################ +; # Devilbox PHP defaults for 5.6-work +; ############################################################ + +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. + + +[PHP] + +; Memory +; Note: "memory_limit" should be larger than "post_max_size" +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M +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 = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On diff --git a/Dockerfiles/work/data/php-ini.d/php-7.0.ini b/Dockerfiles/work/data/php-ini.d/php-7.0.ini new file mode 100644 index 0000000..25b3ceb --- /dev/null +++ b/Dockerfiles/work/data/php-ini.d/php-7.0.ini @@ -0,0 +1,43 @@ +; ############################################################ +; # Devilbox PHP defaults for 7.0-work +; ############################################################ + +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. + + +[PHP] + +; Memory +; Note: "memory_limit" should be larger than "post_max_size" +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M +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 = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On diff --git a/Dockerfiles/work/data/php-ini.d/php-7.1.ini b/Dockerfiles/work/data/php-ini.d/php-7.1.ini new file mode 100644 index 0000000..863c37f --- /dev/null +++ b/Dockerfiles/work/data/php-ini.d/php-7.1.ini @@ -0,0 +1,43 @@ +; ############################################################ +; # Devilbox PHP defaults for 7.1-work +; ############################################################ + +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. + + +[PHP] + +; Memory +; Note: "memory_limit" should be larger than "post_max_size" +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M +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 = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On diff --git a/Dockerfiles/work/data/php-ini.d/php-7.2.ini b/Dockerfiles/work/data/php-ini.d/php-7.2.ini new file mode 100644 index 0000000..a8b43c8 --- /dev/null +++ b/Dockerfiles/work/data/php-ini.d/php-7.2.ini @@ -0,0 +1,42 @@ +; ############################################################ +; # Devilbox PHP defaults for 7.2-work +; ############################################################ + +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. + + +[PHP] + +; Memory +; Note: "memory_limit" should be larger than "post_max_size" +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M +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 = On +display_startup_errors = On +log_errors = On +html_errors = On diff --git a/Dockerfiles/work/data/php-ini.d/php-7.3.ini b/Dockerfiles/work/data/php-ini.d/php-7.3.ini new file mode 100644 index 0000000..15d063a --- /dev/null +++ b/Dockerfiles/work/data/php-ini.d/php-7.3.ini @@ -0,0 +1,42 @@ +; ############################################################ +; # Devilbox PHP defaults for 7.3-work +; ############################################################ + +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. + + +[PHP] + +; Memory +; Note: "memory_limit" should be larger than "post_max_size" +memory_limit = 512M + + +; Timeouts +max_execution_time = 180 +max_input_time = 180 + + +; Uploads +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M +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 = On +display_startup_errors = On +log_errors = On +html_errors = On diff --git a/Dockerfiles/work/data/php.d/php-5.3.ini b/Dockerfiles/work/data/php.d/php-5.3.ini deleted file mode 100644 index ba7061a..0000000 --- a/Dockerfiles/work/data/php.d/php-5.3.ini +++ /dev/null @@ -1,17 +0,0 @@ -; ############################################################ -; # 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 deleted file mode 100644 index ba7061a..0000000 --- a/Dockerfiles/work/data/php.d/php-5.4.ini +++ /dev/null @@ -1,17 +0,0 @@ -; ############################################################ -; # 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 deleted file mode 100644 index ba7061a..0000000 --- a/Dockerfiles/work/data/php.d/php-5.5.ini +++ /dev/null @@ -1,17 +0,0 @@ -; ############################################################ -; # 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 deleted file mode 100644 index ba7061a..0000000 --- a/Dockerfiles/work/data/php.d/php-5.6.ini +++ /dev/null @@ -1,17 +0,0 @@ -; ############################################################ -; # 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 deleted file mode 100644 index ba7061a..0000000 --- a/Dockerfiles/work/data/php.d/php-7.0.ini +++ /dev/null @@ -1,17 +0,0 @@ -; ############################################################ -; # 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 deleted file mode 100644 index ba7061a..0000000 --- a/Dockerfiles/work/data/php.d/php-7.1.ini +++ /dev/null @@ -1,17 +0,0 @@ -; ############################################################ -; # 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 deleted file mode 100644 index a87a0ea..0000000 --- a/Dockerfiles/work/data/php.d/php-7.2.ini +++ /dev/null @@ -1,16 +0,0 @@ -; ############################################################ -; # 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 -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 deleted file mode 100644 index a87a0ea..0000000 --- a/Dockerfiles/work/data/php.d/php-7.3.ini +++ /dev/null @@ -1,16 +0,0 @@ -; ############################################################ -; # 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 -log_errors = On -html_errors = On diff --git a/build/ansible/CONFIGURATION/php-base.ini.j2 b/build/ansible/CONFIGURATION/php-base.ini.j2 deleted file mode 100644 index 96b43b8..0000000 --- a/build/ansible/CONFIGURATION/php-base.ini.j2 +++ /dev/null @@ -1,48 +0,0 @@ -; ############################################################ -; # 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 -; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M - - -; Timeouts -max_execution_time = 180 -max_input_time = 180 - - -; Uploads -; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M -max_file_uploads = 20 - - -; Vars -variables_order = EGPCS -{% if not (php_version == 5.2 or php_version == 5.3 ) %} -max_input_vars = 8000 -{% endif %} -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 -{% 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 -{% endif %} -log_errors = On diff --git a/build/ansible/CONFIGURATION/php-prod.ini.j2 b/build/ansible/CONFIGURATION/php-prod.ini.j2 deleted file mode 100644 index cbbb137..0000000 --- a/build/ansible/CONFIGURATION/php-prod.ini.j2 +++ /dev/null @@ -1,9 +0,0 @@ -; ############################################################ -; # 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.j2 b/build/ansible/CONFIGURATION/php-work.ini.j2 deleted file mode 100644 index 4aa6904..0000000 --- a/build/ansible/CONFIGURATION/php-work.ini.j2 +++ /dev/null @@ -1,19 +0,0 @@ -; ############################################################ -; # 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 -{% 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 -{% endif %} -log_errors = On -html_errors = On diff --git a/build/ansible/CONFIGURATIONS/php-fpm.conf.j2 b/build/ansible/CONFIGURATIONS/php-fpm.conf.j2 new file mode 100644 index 0000000..19c3436 --- /dev/null +++ b/build/ansible/CONFIGURATIONS/php-fpm.conf.j2 @@ -0,0 +1,163 @@ +{% if not php_version == 5.2 %} +[global] +daemonize = no +include = /usr/local/etc/php-fpm.d/*.conf +{% else %} +{# PHP-FPM 5.2 uses XML format for configuration #} + + + + All relative paths in this config are relative to php's install prefix + +
+ Pid file + /var/run/php-fpm.pid + + Error log file + {{ item.cfg[item.key].error_log | default(item.cfg[item.alt].error_log) }} + + Log level + {{ item.cfg[item.key].log_level | default(item.cfg[item.alt].log_level) }} + + When this amount of php processes exited with SIGSEGV or SIGBUS ... + 10 + + ... in a less than this interval of time, a graceful restart will be initiated. + Useful to work around accidental curruptions in accelerator's shared memory. + 1m + + Time limit on waiting child's reaction on signals from master + 5s + + Set to 'no' to debug fpm + no +
+ + + +
+ + Name of pool. Used in logs and stats. + default + + Address to accept fastcgi requests on. + Valid syntax is 'ip.ad.re.ss:port' or just 'port' or '/path/to/unix/socket' + 0.0.0.0:{{ item.cfg[item.key].listen | default(item.cfg[item.alt].listen) }} + + + Set listen(2) backlog + {{ item.cfg[item.key].listen_backlog | default(item.cfg[item.alt].listen_backlog) }} + Set permissions for unix socket, if one used. + In Linux read/write permissions must be set in order to allow connections from web server. + Many BSD-derrived systems allow connections regardless of permissions. + + + 0666 + + + Additional php.ini defines, specific to this pool of workers. + + {{ item.cfg[item.key].error_reporting | default(item.cfg[item.alt].error_reporting) }} + {{ item.cfg[item.key].xmlrpc_errors | default(item.cfg[item.alt].xmlrpc_errors) }} + {{ item.cfg[item.key].report_memleaks | default(item.cfg[item.alt].report_memleaks) }} + {{ item.cfg[item.key].display_errors | default(item.cfg[item.alt].display_errors) }} + {{ item.cfg[item.key].display_startup_errors | default(item.cfg[item.alt].display_startup_errors) }} + {{ item.cfg[item.key].track_errors | default(item.cfg[item.alt].track_errors) }} + {{ item.cfg[item.key].log_errors | default(item.cfg[item.alt].log_errors) }} + {{ item.cfg[item.key].html_errors | default(item.cfg[item.alt].html_errors) }} + + + Unix user of processes + {{ item.cfg[item.key].user | default(item.cfg[item.alt].user) }} + + Unix group of processes + {{ item.cfg[item.key].group | default(item.cfg[item.alt].group) }} + + Process manager settings + + + Sets style of controling worker process count. + Valid values are 'static' and 'apache-like' + apache-like + + Sets the limit on the number of simultaneous requests that will be served. + Equivalent to Apache MaxClients directive. + Equivalent to PHP_FCGI_CHILDREN environment in original php.fcgi + Used with any pm_style. + {{ item.cfg[item.key].pm_max_children | default(item.cfg[item.alt].pm_max_children) }} + + Settings group for 'apache-like' pm style + + Sets the number of server processes created on startup. + Used only when 'apache-like' pm_style is selected + {{ item.cfg[item.key].pm_start_servers | default(item.cfg[item.alt].pm_start_servers) }} + + Sets the desired minimum number of idle server processes. + Used only when 'apache-like' pm_style is selected + {{ item.cfg[item.key].pm_min_spare_servers | default(item.cfg[item.alt].pm_min_spare_servers) }} + + Sets the desired maximum number of idle server processes. + Used only when 'apache-like' pm_style is selected + {{ item.cfg[item.key].pm_max_spare_servers | default(item.cfg[item.alt].pm_max_spare_servers) }} + + + + + The timeout (in seconds) for serving a single request after which the worker process will be terminated + Should be used when 'max_execution_time' ini option does not stop script execution for some reason + '0s' means 'off' + {{ item.cfg[item.key].request_terminate_timeout | default(item.cfg[item.alt].request_terminate_timeout) }} + + The timeout (in seconds) for serving of single request after which a php backtrace will be dumped to slow.log file + '0s' means 'off' + 0s + + The log file for slow requests + logs/slow.log + + Set open file desc rlimit + 1024 + + Set max core size rlimit + 0 + + Chroot to this directory at the start, absolute path + + + Chdir to this directory at the start, absolute path + + + Redirect workers' stdout and stderr into main error log. + If not set, they will be redirected to /dev/null, according to FastCGI specs + {{ item.cfg[item.key].catch_workers_output | default(item.cfg[item.alt].catch_workers_output) }} + + How much requests each process should execute before respawn. + Useful to work around memory leaks in 3rd party libraries. + For endless request processing please specify 0 + Equivalent to PHP_FCGI_MAX_REQUESTS + {{ item.cfg[item.key].pm_max_requests | default(item.cfg[item.alt].pm_max_requests) }} + + Comma separated list of ipv4 addresses of FastCGI clients that allowed to connect. + Equivalent to FCGI_WEB_SERVER_ADDRS environment in original php.fcgi (5.2.2+) + Makes sense only with AF_INET listening socket. + + + Pass environment variables like LD_LIBRARY_PATH + All $VARIABLEs are taken from current environment + + $HOSTNAME + /usr/local/bin:/usr/bin:/bin + /tmp + /tmp + /tmp + $OSTYPE + $MACHTYPE + 2 + + +
+ + + + +{% endif %} diff --git a/build/ansible/CONFIGURATIONS/php-fpm.d-conf.j2 b/build/ansible/CONFIGURATIONS/php-fpm.d-conf.j2 new file mode 100644 index 0000000..890196e --- /dev/null +++ b/build/ansible/CONFIGURATIONS/php-fpm.d-conf.j2 @@ -0,0 +1,110 @@ +{# PHP-FPM 5.2 uses XML format for configuration and does not allow multiple files #} +{% if not php_version == 5.2 %} +[www] + +; ############################################################ +; Required for Dockerization +; ############################################################ + +{# This value is available since PHP >=5.4 #} +{% if not php_version == 5.3 %} +; Keep env variables set by docker +clear_env = {{ item.cfg[item.key].clear_env | default(item.cfg[item.alt].clear_env) }} +{% endif %} + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = {{ item.cfg[item.key].catch_workers_output | default(item.cfg[item.alt].catch_workers_output) }} + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = {{ item.cfg[item.key].listen | default(item.cfg[item.alt].listen)}} +{# Available since PHP >= 5.4 #} +listen.backlog = {{ item.cfg[item.key].listen_backlog | default(item.cfg[item.alt].listen_backlog) }} + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = {{ item.cfg[item.key].request_terminate_timeout | default(item.cfg[item.alt].request_terminate_timeout) }} + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = {{ item.cfg[item.key].error_log | default(item.cfg[item.alt].error_log) }} +log_level = {{ item.cfg[item.key].log_level | default(item.cfg[item.alt].log_level) }} + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = {{ item.cfg[item.key].access_log | default(item.cfg[item.alt].access_log) }} + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] +; The number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +pm = {{ item.cfg[item.key].pm | default(item.cfg[item.alt].pm) }} + +; The maximum number of child processes to be created +pm.max_children = {{ item.cfg[item.key].pm_max_children | default(item.cfg[item.alt].pm_max_children) }} + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = {{ item.cfg[item.key].pm_start_servers | default(item.cfg[item.alt].pm_start_servers) }} + +; The desired minimum number of idle server processes. +pm.min_spare_servers = {{ item.cfg[item.key].pm_min_spare_servers | default(item.cfg[item.alt].pm_min_spare_servers) }} + +; The desired maximum number of idle server processes. +pm.max_spare_servers = {{ item.cfg[item.key].pm_max_spare_servers | default(item.cfg[item.alt].pm_max_spare_servers) }} + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = {{ item.cfg[item.key].pm_max_requests | default(item.cfg[item.alt].pm_max_requests) }} + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = {{ item.cfg[item.key].user | default(item.cfg[item.alt].user) }} +group = {{ item.cfg[item.key].group | default(item.cfg[item.alt].group) }} + + +; ############################################################ +; PHP settings +; ############################################################ +php_value[error_reporting] = {{ item.cfg[item.key].error_reporting | default(item.cfg[item.alt].error_reporting) }} +php_flag[xmlrpc_errors] = {{ item.cfg[item.key].xmlrpc_errors | default(item.cfg[item.alt].xmlrpc_errors) }} +php_flag[report_memleaks] = {{ item.cfg[item.key].report_memleaks | default(item.cfg[item.alt].report_memleaks) }} +php_flag[display_errors] = {{ item.cfg[item.key].display_errors | default(item.cfg[item.alt].display_errors) }} +php_flag[display_startup_errors] = {{ item.cfg[item.key].display_startup_errors | default(item.cfg[item.alt].display_startup_errors) }} +{# Only available before PHP 7.2 #} +{% 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 %} +php_flag[track_errors] = {{ item.cfg[item.key].track_errors | default(item.cfg[item.alt].track_errors) }} +{% endif %} +php_flag[log_errors] = {{ item.cfg[item.key].log_errors | default(item.cfg[item.alt].log_errors) }} +php_flag[html_errors] = {{ item.cfg[item.key].html_errors | default(item.cfg[item.alt].html_errors) }} +{% endif %} diff --git a/build/ansible/CONFIGURATIONS/php.ini.j2 b/build/ansible/CONFIGURATIONS/php.ini.j2 new file mode 100644 index 0000000..8fc2a69 --- /dev/null +++ b/build/ansible/CONFIGURATIONS/php.ini.j2 @@ -0,0 +1,49 @@ +; ############################################################ +; # Devilbox PHP defaults for {{ php_version }}-{{ item.key }} +; ############################################################ + +; Each PHP flavour (base, mods, prod, work) might have its own php.ini. +; If none is present, the one from the previous flavour is inherited. + + +[PHP] + +; Memory +; Note: "memory_limit" should be larger than "post_max_size" +memory_limit = {{ item.cfg[item.key].memory_limit | default(item.cfg[item.alt].memory_limit) }} + + +; Timeouts +max_execution_time = {{ item.cfg[item.key].max_execution_time | default(item.cfg[item.alt].max_execution_time) }} +max_input_time = {{ item.cfg[item.key].max_input_time | default(item.cfg[item.alt].max_input_time) }} + + +; Uploads +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = {{ item.cfg[item.key].post_max_size | default(item.cfg[item.alt].post_max_size) }} +upload_max_filesize = {{ item.cfg[item.key].upload_max_filesize | default(item.cfg[item.alt].upload_max_filesize) }} +max_file_uploads = {{ item.cfg[item.key].max_file_uploads | default(item.cfg[item.alt].max_file_uploads) }} + + +; Vars +variables_order = {{ item.cfg[item.key].variables_order | default(item.cfg[item.alt].variables_order) }} +{# Only available since PHP >=5.4 #} +{% if not (php_version == 5.2 or php_version == 5.3 ) %} +max_input_vars = {{ item.cfg[item.key].max_input_vars | default(item.cfg[item.alt].max_input_vars) }} +{% endif %} +max_input_nesting_level = {{ item.cfg[item.key].max_input_nesting_level | default(item.cfg[item.alt].max_input_nesting_level) }} + + +; Error reporting +; Note: error_log is dynamic and handled during start to set appropriate setting +error_reporting = {{ item.cfg[item.key].error_reporting | default(item.cfg[item.alt].error_reporting) }} +xmlrpc_errors = {{ item.cfg[item.key].xmlrpc_errors | default(item.cfg[item.alt].xmlrpc_errors) }} +report_memleaks = {{ item.cfg[item.key].report_memleaks | default(item.cfg[item.alt].report_memleaks) }} +display_errors = {{ item.cfg[item.key].display_errors | default(item.cfg[item.alt].display_errors) }} +display_startup_errors = {{ item.cfg[item.key].display_startup_errors | default(item.cfg[item.alt].display_startup_errors) }} +{# Only available before PHP 7.2 #} +{% 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 = {{ item.cfg[item.key].track_errors | default(item.cfg[item.alt].track_errors) }} +{% endif %} +log_errors = {{ item.cfg[item.key].log_errors | default(item.cfg[item.alt].log_errors) }} +html_errors = {{ item.cfg[item.key].html_errors | default(item.cfg[item.alt].html_errors) }} diff --git a/build/ansible/DOCKERFILES/Dockerfile-base.j2 b/build/ansible/DOCKERFILES/Dockerfile-base.j2 index 606b5da..77f93eb 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-base.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-base.j2 @@ -1,5 +1,7 @@ # Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-base.j2 instead. -{% if php_version == 5.3 %} +{% if php_version == 5.2 %} +FROM devilbox/php-fpm-5.2 +{% elif php_version == 5.3 %} FROM devilbox/php-fpm-5.3 {% elif php_version == 7.3 %} FROM devilbox/php-fpm-7.3 @@ -62,14 +64,12 @@ 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/php-ini.d/php-{{ php_version }}.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-{{ php_version }}.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-{{ php_version }}.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + 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 -COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d -{% if php_version == 5.3 %} -COPY ./data/php-fpm.d-docker-5.3.conf /usr/local/etc/php-fpm.d/docker.conf -{% endif %} {% if debug %} diff --git a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 index d3e1e1a..95bb84a 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 @@ -50,7 +50,6 @@ 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 9c858ef..2207b35 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -191,13 +191,17 @@ RUN set -x \ ### ### Copy files ### -COPY ./data/php.d/php-{{ php_version }}.ini /usr/local/etc/php/conf.d/yyy-devilbox-04-work.ini +COPY ./data/php-ini.d/php-{{ php_version }}.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini +COPY ./data/php-fpm.conf/php-fpm-{{ php_version }}.conf /usr/local/etc/php-fpm.conf +COPY ./data/php-fpm.d/php-fpm.d-{{ php_version }}.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf + COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ COPY ./data/bash-devilbox /etc/bash-devilbox COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox + ### ### Volumes ### diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index e7c261e..1fcad9a 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -1,33 +1,15 @@ --- -# All available Docker flavours (for each version) -template_files: - - src: DOCKERFILES/Dockerfile-base.j2 - dst: "../../Dockerfiles/base/Dockerfile-{{ php_version }}" - - src: DOCKERFILES/Dockerfile-mods.j2 - dst: "../../Dockerfiles/mods/Dockerfile-{{ php_version }}" - - src: DOCKERFILES/Dockerfile-prod.j2 - dst: "../../Dockerfiles/prod/Dockerfile-{{ php_version }}" - - 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.j2 - dst: "../../Dockerfiles/base/data/php.d/php-{{ php_version }}.ini" - - src: CONFIGURATION/php-prod.ini.j2 - dst: "../../Dockerfiles/prod/data/php.d/php-{{ php_version }}.ini" - - src: CONFIGURATION/php-work.ini.j2 - dst: "../../Dockerfiles/work/data/php.d/php-{{ php_version }}.ini" +################################################################################ +# Variables for rendering Dockerfiles and configuration +################################################################################ -# Adds self-validating checks to Dockerfile -# turn off for final build -debug: True - - -# All available PHP version +### +### Available PHP versions +### php_all_versions: + - 5.2 - 5.3 - 5.4 - 5.5 @@ -38,6 +20,205 @@ php_all_versions: - 7.3 +### +### PHP settings equal for php.ini and php-fpm.comf (used below) +### +php_settings_all: + # ---- Settings for PHP.INI and PHP-FPM.CONF ---- + base: + # Timeouts + timeout: 180 + # Error reporting + 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' + html_errors: 'Off' + + work: + # Timeouts + timeout: 180 + # Error reporting + error_reporting: E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED + xmlrpc_errors: 'Off' + report_memleaks: 'On' + display_errors: 'On' + display_startup_errors: 'On' + track_errors: 'On' + log_errors: 'On' + html_errors: 'On' + + +### +### PHP.ini +### +php_settings_ini: + # ---- Sane default ---- + base: + # Memory + memory_limit: 512M + # Timeouts + max_execution_time: "{{ php_settings_all.base.timeout }}" + max_input_time: "{{ php_settings_all.base.timeout }}" + # Uploads + post_max_size: 384M + upload_max_filesize: 256M + max_file_uploads: 20 + # Variables + variables_order: EGPCS + max_input_vars: 8000 + max_input_nesting_level: 64 + # Error reporting + error_reporting: "{{ php_settings_all.base.error_reporting }}" + xmlrpc_errors: "{{ php_settings_all.base.xmlrpc_errors }}" + report_memleaks: "{{ php_settings_all.base.report_memleaks }}" + display_errors: "{{ php_settings_all.base.display_errors }}" + display_startup_errors: "{{ php_settings_all.base.display_startup_errors }}" + track_errors: "{{ php_settings_all.base.track_errors }}" + log_errors: "{{ php_settings_all.base.log_errors }}" + html_errors: "{{ php_settings_all.base.html_errors }}" + # ---- Inherits from base ---- + mods: + # ---- Inherits from base ---- + prod: + # ---- Inherits from base and overwrites certain values ---- + work: + # Error reporting + error_reporting: "{{ php_settings_all.work.error_reporting }}" + xmlrpc_errors: "{{ php_settings_all.work.xmlrpc_errors }}" + report_memleaks: "{{ php_settings_all.work.report_memleaks }}" + display_errors: "{{ php_settings_all.work.display_errors }}" + display_startup_errors: "{{ php_settings_all.work.display_startup_errors }}" + track_errors: "{{ php_settings_all.work.track_errors }}" + log_errors: "{{ php_settings_all.work.log_errors }}" + html_errors: "{{ php_settings_all.work.html_errors }}" + + +### +### PHP-FPM.conf +### +php_settings_fpm: + # ---- Sane default ---- + base: + # Docker + clear_env: 'no' + catch_workers_output: 'yes' + # Timeouts + request_terminate_timeout: "{{ php_settings_all.work.timeout }}s" + # Network + listen: 9000 + listen_backlog: 1023 + # Logging + log_level: notice + error_log: /proc/self/fd/2 + access_log: /proc/self/fd/2 + # Worker + pm: dynamic + pm_max_children: 50 + pm_start_servers: 10 + pm_min_spare_servers: 5 + pm_max_spare_servers: 15 + pm_max_requests: 500 + # User/Group + user: devilbox + group: devilbox + # Error reporting + error_reporting: "{{ php_settings_all.base.error_reporting }}" + xmlrpc_errors: "{{ php_settings_all.base.xmlrpc_errors }}" + report_memleaks: "{{ php_settings_all.base.report_memleaks }}" + display_errors: "{{ php_settings_all.base.display_errors }}" + display_startup_errors: "{{ php_settings_all.base.display_startup_errors }}" + track_errors: "{{ php_settings_all.base.track_errors }}" + log_errors: "{{ php_settings_all.base.log_errors }}" + html_errors: "{{ php_settings_all.base.html_errors }}" + # ---- Inherits from base ---- + mods: + # ---- Inherits from base ---- + prod: + # ---- Inherits from base and overwrites certain values ---- + work: + # Error reporting + error_reporting: "{{ php_settings_all.work.error_reporting }}" + xmlrpc_errors: "{{ php_settings_all.work.xmlrpc_errors }}" + report_memleaks: "{{ php_settings_all.work.report_memleaks }}" + display_errors: "{{ php_settings_all.work.display_errors }}" + display_startup_errors: "{{ php_settings_all.work.display_startup_errors }}" + track_errors: "{{ php_settings_all.work.track_errors }}" + log_errors: "{{ php_settings_all.work.log_errors }}" + html_errors: "{{ php_settings_all.work.html_errors }}" + + +### +### Templates for PHP flavours (base, mods, prod and work) for all PHP versions +### + +# Dockerfiles for base, mods, prod and work +template_dockerfiles: + - src: DOCKERFILES/Dockerfile-base.j2 + dst: "../../Dockerfiles/base/Dockerfile-{{ php_version }}" + - src: DOCKERFILES/Dockerfile-mods.j2 + dst: "../../Dockerfiles/mods/Dockerfile-{{ php_version }}" + - src: DOCKERFILES/Dockerfile-prod.j2 + dst: "../../Dockerfiles/prod/Dockerfile-{{ php_version }}" + - src: DOCKERFILES/Dockerfile-work.j2 + dst: "../../Dockerfiles/work/Dockerfile-{{ php_version }}" + +# Configuration files for base, mods, prod and work +template_configurations: + # php.ini + - src: CONFIGURATIONS/php.ini.j2 + dst: "../../Dockerfiles/base/data/php-ini.d/php-{{ php_version }}.ini" + cfg: "{{ php_settings_ini }}" + key: base + alt: base + - src: CONFIGURATIONS/php.ini.j2 + dst: "../../Dockerfiles/work/data/php-ini.d/php-{{ php_version }}.ini" + cfg: "{{ php_settings_ini }}" + key: work + alt: base # Alternative key to use when definition is not set in 'work' + + # php-fpm.conf + - src: CONFIGURATIONS/php-fpm.conf.j2 + dst: "../../Dockerfiles/base/data/php-fpm.conf/php-fpm-{{ php_version }}.conf" + cfg: "{{ php_settings_fpm }}" + key: base + alt: base + - src: CONFIGURATIONS/php-fpm.conf.j2 + dst: "../../Dockerfiles/work/data/php-fpm.conf/php-fpm-{{ php_version }}.conf" + cfg: "{{ php_settings_fpm }}" + key: work + alt: base + + # php-fpm.d-conf + - src: CONFIGURATIONS/php-fpm.d-conf.j2 + dst: "../../Dockerfiles/base/data/php-fpm.d/php-fpm.d-{{ php_version }}.conf" + cfg: "{{ php_settings_fpm }}" + key: base + alt: base + - src: CONFIGURATIONS/php-fpm.d-conf.j2 + dst: "../../Dockerfiles/work/data/php-fpm.d/php-fpm.d-{{ php_version }}.conf" + cfg: "{{ php_settings_fpm }}" + key: work + alt: base + + # php-fpm.conf (only applied to base and fully inherited) + # + # # php-fpm.d/php-fpm.d.conf (only applied to base and full inherited) + # - src: CONFIGURATIONS/php-fpm.d/php-fpm-base.d.conf.j2 + # dst: "../../Dockerfiles/base/data/php-fpm.d/php-fpm.d-{{ php_version }}.conf" + + +### +### Variables to be used in this file (group_vars/all.yml) +### + +# Adds self-validating checks to Dockerfile +# turn off for final build +debug: True + # Global variables compose_home: /usr/local/src/composer @@ -92,7 +273,6 @@ software_enabled: - cleanup - ### ### All available extra repositories ### diff --git a/build/ansible/roles/template/tasks/main.yml b/build/ansible/roles/template/tasks/main.yml index b4c3035..4cb0879 100644 --- a/build/ansible/roles/template/tasks/main.yml +++ b/build/ansible/roles/template/tasks/main.yml @@ -1,19 +1,19 @@ --- -- name: render template +- name: generate Dockerfiles template: src: "{{ item.src }}" dest: "{{ item.dst }}" force: True mode: 0644 with_items: - - "{{ template_files }}" + - "{{ template_dockerfiles }}" -- name: copy php.ini configuration +- name: generate php configuration files template: src: "{{ item.src }}" dest: "{{ item.dst }}" force: True mode: 0644 with_items: - - "{{ ini_files }}" + - "{{ template_configurations }}"