Commit 8b3b28f5 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Docker: changements pour se rapprocher des corrections faites pour résoudre... 

Docker: changements pour se rapprocher des corrections faites pour résoudre les problèmes lors du déploiement de gaethan (lenteur extrême).
parent 14b68fcf

Dockerfile

+2 −2
Changes for Dockerfile: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ RUN ln -sf /dev/stderr /var/log/apache2/error.log 
ADD docker/apache-ports.conf     ${APACHE_CONF_DIR}/ports.conf

ADD docker/apache-site.conf      ${APACHE_CONF_DIR}/sites-available/app.conf

ADD docker/apache-site-ssl.conf  ${APACHE_CONF_DIR}/sites-available/app-ssl.conf

ADD docker/fpm/pool.d/app.conf  ${PHP_CONF_DIR}/fpm/pool.d/app.conf

ADD docker/fpm/conf.d/app.ini   ${PHP_CONF_DIR}/fpm/conf.d/90-app.ini

ADD docker/fpm/pool.d/www.conf   ${PHP_CONF_DIR}/fpm/pool.d/

ADD docker/fpm/conf.d/99-app.ini ${PHP_CONF_DIR}/fpm/conf.d/



# Copie des scripts complémentaires à lancer au démarrage du container

COPY docker/entrypoint.d/* /entrypoint.d/

Dockerfile.sh

+2 −2
Changes for Dockerfile.sh: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ cd ${SYGAL_DIR} 
cp docker/apache-ports.conf     ${APACHE_CONF_DIR}/ports.conf

cp docker/apache-site.conf      ${APACHE_CONF_DIR}/sites-available/app.conf

cp docker/apache-site-ssl.conf  ${APACHE_CONF_DIR}/sites-available/app-ssl.conf

cp docker/fpm/pool.d/app.conf  ${PHP_CONF_DIR}/fpm/pool.d/app.conf

cp docker/fpm/conf.d/app.ini   ${PHP_CONF_DIR}/fpm/conf.d/90-app.ini

cp docker/fpm/pool.d/www.conf   ${PHP_CONF_DIR}/fpm/pool.d/

cp docker/fpm/conf.d/90-app.ini ${PHP_CONF_DIR}/fpm/conf.d/



sed -i -re 's/SetEnv APPLICATION_ENV "(development|test)"/SetEnv APPLICATION_ENV "production"/' \

    ${APACHE_CONF_DIR}/sites-available/app-ssl.conf

docker/apache-site-ssl.conf

+1 −1
Changes for docker/apache-site-ssl.conf: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


    <IfModule proxy_fcgi_module>

        <FilesMatch ".+\.ph(ar|p|tml)$">

            SetHandler "proxy:unix:/var/run/php-fpm.sock|fcgi://localhost/"

            SetHandler "proxy:unix:/run/php/php-fpm.sock|fcgi://localhost/"

        </FilesMatch>

    </IfModule>

docker/fpm/conf.d/app.ini→docker/fpm/conf.d/99-app.ini

+17 −17
Changes for docker/fpm/conf.d/99-app.ini: 17 added lines, 17 removed lines.
Original line number Diff line number Diff line
@@ -19,23 +19,23 @@ post_max_size = 502M 




;opcache.error_log=/var/log/php_opcache_error.log

opcache.enable = 0

opcache.memory_consumption = 256

opcache.interned_strings_buffer = 8

opcache.max_wasted_percentage = 5

opcache.max_accelerated_files = 16000

; http://php.net/manual/en/opcache.configuration.php#ini.opcache.revalidate-freq

; defaults to zend opcache checking every 180 seconds for PHP file changes

; set to zero to check every second if you are doing alot of frequent

; php file edits/developer work

; opcache.revalidate_freq=0

opcache.revalidate_freq = 180

opcache.fast_shutdown = 0

opcache.enable_cli = 0

opcache.save_comments = 1

opcache.enable_file_override = 1

opcache.validate_timestamps = 1

opcache.huge_code_pages = 0

;opcache.enable = 0

;opcache.memory_consumption = 256

;opcache.interned_strings_buffer = 8

;opcache.max_wasted_percentage = 5

;opcache.max_accelerated_files = 16000

;; http://php.net/manual/en/opcache.configuration.php#ini.opcache.revalidate-freq

;; defaults to zend opcache checking every 180 seconds for PHP file changes

;; set to zero to check every second if you are doing alot of frequent

;; php file edits/developer work

;; opcache.revalidate_freq=0

;opcache.revalidate_freq = 180

;opcache.fast_shutdown = 0

;opcache.enable_cli = 0

;opcache.save_comments = 1

;opcache.enable_file_override = 1

;opcache.validate_timestamps = 1

;opcache.huge_code_pages = 0





xdebug.enable = 1

docker/fpm/pool.d/app.conf

deleted100644 → 0
+0 −24
Changes for docker/fpm/pool.d/app.conf: 0 added lines, 24 removed lines.
Original line number Diff line number Diff line 
[app]



user = www-data

group = www-data



listen = /var/run/php-fpm.sock

listen.owner = www-data

listen.group = www-data



; mandatory values

; Soit:

; pm = dynamic

; pm.max_children = 5

; pm.start_servers = 2

; pm.min_spare_servers = 1

; pm.max_spare_servers = 3

; Soit:

pm = ondemand

pm.max_children = 35

pm.process_idle_timeout = 10s

pm.max_requests = 500



request_slowlog_timeout = 30

slowlog = /var/log/php-fpm.slow.log