Merge pull request #34 from Wolvverine/develop

Dockerfile_nginx-72

@@ -115,7 +115,7 @@ COPY --from=build_glpi --chown=www-data:www-data ${GLPI_PATHS_ROOT} ${GLPI_PATHS
 RUN if [[ "$GLPI_PHP_XDEBUG" = "yes" ]] ; then \
         echo "Xdebug is on"; \
     else \
-        rm -f root\etc\php-fpm.d\xdebug.ini.j2 ; \
+        rm -f root\etc\php-fpm.d\xdebug.conf.j2 ; \
     fi ; 
 
 COPY root/ /

Dockerfile_nginx-74

@@ -101,7 +101,7 @@ RUN set -ex; \
     ; \
     pecl install apcu && docker-php-ext-enable apcu ; \
     if [[ "$PHP_XDEBUG" = "yes" ]] ; then \
-        pecl install xdebug-3.0.0 && docker-php-ext-enable xdebug ; \
+        pecl install xdebug-3.2.1 && docker-php-ext-enable xdebug ; \
     else \
         echo "PHP_XDEBUG is not build - set $PHP_XDEBUG" ; \
     fi ; \
@@ -120,6 +120,7 @@ RUN set -ex; \
 RUN rm -f /usr/local/etc/php-fpm.d/*
 RUN rm -f /etc/nginx/nginx.conf
 RUN rm -f /etc/nginx/conf.d/default.conf
+RUN rm -f /usr/local/etc/php-fpm.conf
 
 # Copy glpi build
 COPY --from=build_glpi --chown=www-data:www-data ${GLPI_PATHS_ROOT} ${GLPI_PATHS_ROOT}
@@ -128,12 +129,13 @@ COPY --from=build_glpi --chown=www-data:www-data ${GLPI_PATHS_ROOT} ${GLPI_PATHS
 RUN if [[ "$PHP_XDEBUG" = "yes" ]] ; then \
         echo "Xdebug is on"; \
     else \
-        rm -f root\etc\php-fpm.d\xdebug.ini.j2 ; \
+        rm -f root\etc\php-fpm.d\xdebug.conf.j2 ; \
     fi ; 
 
 COPY root/ /
 COPY /docker-entrypoint.sh /
 COPY /docker-entrypoint.d/* /docker-entrypoint.d/
+COPY /php-fpm.conf /usr/local/etc/php-fpm.conf
 
 RUN chmod -R +x /docker-entrypoint.d/ /usr/local/bin/cronwrapper.py \
     && chmod -R g=rX,o=--- /var/www/* \

Dockerfile_nginx-82

@@ -120,6 +120,7 @@ RUN set -ex; \
 RUN rm -f /usr/local/etc/php-fpm.d/*
 RUN rm -f /etc/nginx/nginx.conf
 RUN rm -f /etc/nginx/conf.d/default.conf
+RUN rm -f /usr/local/etc/php-fpm.conf
 
 # Copy glpi build
 COPY --from=build_glpi --chown=www-data:www-data ${GLPI_PATHS_ROOT} ${GLPI_PATHS_ROOT}
@@ -128,12 +129,13 @@ COPY --from=build_glpi --chown=www-data:www-data ${GLPI_PATHS_ROOT} ${GLPI_PATHS
 RUN if [[ "$PHP_XDEBUG" = "yes" ]] ; then \
         echo "Xdebug is on"; \
     else \
-        rm -f root\etc\php-fpm.d\xdebug.ini.j2 ; \
+        rm -f root\etc\php-fpm.d\xdebug.conf.j2 ; \
     fi ; 
 
 COPY root/ /
 COPY /docker-entrypoint.sh /
 COPY /docker-entrypoint.d/* /docker-entrypoint.d/
+COPY /php-fpm.conf /usr/local/etc/php-fpm.conf
 
 RUN chmod -R +x /docker-entrypoint.d/ /usr/local/bin/cronwrapper.py \
     && chmod -R g=rX,o=--- /var/www/* \

docker-entrypoint.d/10phpfpm

@@ -3,9 +3,9 @@ set -e
 
 echo 'Configuring PHP FPM...'
 j2 /etc/php-fpm.d/nginx.conf.j2 -o /usr/local/etc/php-fpm.d/zzz-nginx.conf
-j2 /etc/php-fpm.d/custom.ini.j2 -o /usr/local/etc/php-fpm.d/zzz-tuning.ini
+j2 /etc/php-fpm.d/custom.conf.j2 -o /usr/local/etc/php-fpm.d/zzz-tuning.conf
 # to lowercase
 PHP_XDEBUG=$(echo "${PHP_XDEBUG}" | tr '[:upper:]' '[:lower:]')
 if [ "${PHP_XDEBUG}" = "yes"  ]; then
-    j2 /etc/php-fpm.d/xdebug.ini.j2 -o /usr/local/etc/php-fpm.d/xdebug-config.ini
+    j2 /etc/php-fpm.d/xdebug.conf.j2 -o /usr/local/etc/php-fpm.d/xdebug-config.conf
 fi

php-fpm.conf

@@ -0,0 +1,144 @@
+;;;;;;;;;;;;;;;;;;;;;
+; FPM Configuration ;
+;;;;;;;;;;;;;;;;;;;;;
+
+; All relative paths in this configuration file are relative to PHP's install
+; prefix (/usr/local). This prefix can be dynamically changed by using the
+; '-p' argument from the command line.
+
+;;;;;;;;;;;;;;;;;;
+; Global Options ;
+;;;;;;;;;;;;;;;;;;
+
+[global]
+; Pid file
+; Note: the default prefix is /usr/local/var
+; Default Value: none
+;pid = run/php-fpm.pid
+
+; Error log file
+; If it's set to "syslog", log is sent to syslogd instead of being written
+; into a local file.
+; Note: the default prefix is /usr/local/var
+; Default Value: log/php-fpm.log
+
+error_log = /proc/self/fd/2
+
+; syslog_facility is used to specify what type of program is logging the
+; message. This lets syslogd specify that messages from different facilities
+; will be handled differently.
+; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON)
+; Default Value: daemon
+;syslog.facility = daemon
+
+; syslog_ident is prepended to every message. If you have multiple FPM
+; instances running on the same server, you can change the default value
+; which must suit common needs.
+; Default Value: php-fpm
+;syslog.ident = php-fpm
+
+; Log level
+; Possible Values: alert, error, warning, notice, debug
+; Default Value: notice
+log_level = notice
+
+; Log limit on number of characters in the single line (log entry). If the
+; line is over the limit, it is wrapped on multiple lines. The limit is for
+; all logged characters including message prefix and suffix if present. However
+; the new line character does not count into it as it is present only when
+; logging to a file descriptor. It means the new line character is not present
+; when logging to syslog.
+; Default Value: 1024
+;log_limit = 4096
+
+; Log buffering specifies if the log line is buffered which means that the
+; line is written in a single write operation. If the value is false, then the
+; data is written directly into the file descriptor. It is an experimental
+; option that can potentionaly improve logging performance and memory usage
+; for some heavy logging scenarios. This option is ignored if logging to syslog
+; as it has to be always buffered.
+; Default value: yes
+;log_buffering = no
+
+; If this number of child processes exit with SIGSEGV or SIGBUS within the time
+; interval set by emergency_restart_interval then FPM will restart. A value
+; of '0' means 'Off'.
+; Default Value: 0
+;emergency_restart_threshold = 0
+
+; Interval of time used by emergency_restart_interval to determine when
+; a graceful restart will be initiated.  This can be useful to work around
+; accidental corruptions in an accelerator's shared memory.
+; Available Units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
+;emergency_restart_interval = 0
+
+; Time limit for child processes to wait for a reaction on signals from master.
+; Available units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
+;process_control_timeout = 0
+
+; The maximum number of processes FPM will fork. This has been designed to control
+; the global number of processes when using dynamic PM within a lot of pools.
+; Use it with caution.
+; Note: A value of 0 indicates no limit
+; Default Value: 0
+; process.max = 128
+
+; Specify the nice(2) priority to apply to the master process (only if set)
+; The value can vary from -19 (highest priority) to 20 (lowest priority)
+; Note: - It will only work if the FPM master process is launched as root
+;       - The pool process will inherit the master process priority
+;         unless specified otherwise
+; Default Value: no set
+; process.priority = -19
+
+; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
+; Default Value: yes
+daemonize = no
+
+; Set open file descriptor rlimit for the master process.
+; Default Value: system defined value
+;rlimit_files = 1024
+
+; Set max core size rlimit for the master process.
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+;rlimit_core = 0
+
+; Specify the event mechanism FPM will use. The following is available:
+; - select     (any POSIX os)
+; - poll       (any POSIX os)
+; - epoll      (linux >= 2.5.44)
+; - kqueue     (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0)
+; - /dev/poll  (Solaris >= 7)
+; - port       (Solaris >= 10)
+; Default Value: not set (auto detection)
+;events.mechanism = epoll
+
+; When FPM is built with systemd integration, specify the interval,
+; in seconds, between health report notification to systemd.
+; Set to 0 to disable.
+; Available Units: s(econds), m(inutes), h(ours)
+; Default Unit: seconds
+; Default value: 10
+;systemd_interval = 10
+
+;;;;;;;;;;;;;;;;;;;;
+; Pool Definitions ;
+;;;;;;;;;;;;;;;;;;;;
+
+; Multiple pools of child processes may be started with different listening
+; ports and different management options.  The name of the pool will be
+; used in logs and stats. There is no limitation on the number of pools which
+; FPM can handle. Your system will tell you anyway :)
+
+; Include one or more files. If glob(3) exists, it is used to include a bunch of
+; files from a glob(3) pattern. This directive can be used everywhere in the
+; file.
+; Relative path can also be used. They will be prefixed by:
+;  - the global prefix if it's been set (-p argument)
+;  - /usr/local otherwise
+include=etc/php-fpm.d/*.conf

root/etc/php-fpm.d/custom.ini.j2 → root/etc/php-fpm.d/custom.conf.j2

@@ -1,8 +1,6 @@
-daemonize = no
-error_log = /proc/self/fd/2
-log_level = notice
 {#
 {% if "{% raw %}{{ 'PHPFPM_DECORATE_WORKERS_OUTPUT'|getenv('') }}{% endraw %}"  %}
 decorate_workers_output = {{ env('PHPFPM_DECORATE_WORKERS_OUTPUT') }}
 {% endif %}
 #}
+