Fin de la dockerisation

Dockerfile

@@ -32,7 +32,7 @@ ADD docker/php.conf ${PHP_CONF_DIR}/fpm/conf.d/ose.ini
 ADD docker/apache-ports.conf    ${APACHE_CONF_DIR}/ports.conf
 ADD docker/apache-site.conf     ${APACHE_CONF_DIR}/sites-available/ose.conf
 ADD docker/apache-site-ssl.conf ${APACHE_CONF_DIR}/sites-available/ose-ssl.conf
-#ADD docker/fpm/pool.d/app.conf  ${PHP_CONF_DIR}/fpm/pool.d/ose.conf
+ADD docker/fpm/pool.d/app.conf  ${PHP_CONF_DIR}/fpm/pool.d/ose.conf
 
 RUN a2ensite ose ose-ssl && \
     service php7.0-fpm reload

docker-compose.yml

 version: '2'
 
 services:
-  octopus:
+  ose:
     container_name: ose-container
     build:
       context: .
       dockerfile: Dockerfile
     ports:
     - "8080:80"
-    - "8443:8443"
+    - "8443:443"
     volumes:
     - .:/var/www/ose
-    - /tmp:/tmp
     working_dir: /var/www/ose

docker/apache-ports.conf

 Listen 80
-Listen 8443
+Listen 443
\ No newline at end of file

docker/apache-site-ssl.conf

-<VirtualHost *:8443>
-    ServerName ose.localhost
-    #ServerAlias octopass.localhost
+<VirtualHost *:443>
+     ServerName localhost
      DocumentRoot /var/www/ose/public
 
-    Header always set Strict-Transport-Security "max-age=15768000;includeSubdomains;"
-
      SetEnv APPLICATION_ENV "development"
+
+     RewriteEngine On
+
      <Directory /var/www/ose/public>
          DirectoryIndex index.php
          AllowOverride All
          Require all granted
      </Directory>
 
+    <IfModule proxy_fcgi_module>
+        <FilesMatch ".+\.ph(ar|p|tml)$">
+            SetHandler "proxy:unix:/var/run/php7.0-fpm-ose.sock|fcgi://localhost/"
+        </FilesMatch>
+    </IfModule>
+
      SSLEngine on
      SSLCertificateFile	/etc/ssl/certs/ssl-cert-snakeoil.pem
      SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+
+     Header always set Strict-Transport-Security "max-age=15768000; includeSubdomains;"
+
+     ErrorLog ${APACHE_LOG_DIR}/error.log
+     CustomLog ${APACHE_LOG_DIR}/access.log combined
+     #LogLevel debug
 </VirtualHost>
+

docker/apache-site.conf

 <VirtualHost *:80>
-    ServerName ose.localhost
-    ServerAlias ose.localhost
+     ServerName localhost
      DocumentRoot /var/www/ose/public
 
-    SetEnv APPLICATION_ENV "development"
-    <Directory /var/www/ose/public>
-         DirectoryIndex index.php
-         AllowOverride All
-         Require all granted
-    </Directory>
+     RewriteEngine On
 
-    <IfModule mod_rewrite.c>
-        RewriteEngine on
-        RewriteCond %{HTTPS} !=on
-        RewriteRule ^(.*)?$ https://%{SERVER_NAME}:8443$1 [R=301,L]
-    </IfModule>
+     Header always set Strict-Transport-Security "max-age=15768000; includeSubdomains;"
+
+     ### Redirection en HTTPS
+     RewriteCond %{SERVER_PORT} !^443$
+     RewriteRule ^/(.*) https://%{SERVER_NAME}:443/$1 [L,R]
 
 </VirtualHost>
+

docker/fpm/pool.d/app.conf

+[ose]
+
+user = www-data
+group = www-data
+
+listen = /var/run/php7.0-fpm-ose.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/php5-fpm.slow.log
+

docker/php-opcache.ini

-opcache.memory_consumption=128
-opcache.interned_strings_buffer=8
-opcache.max_accelerated_files=4000
-opcache.revalidate_freq=60
-opcache.fast_shutdown=1
-opcache.enable_cli=1
-opcache.enable=1

docker/php.conf

 date.timezone = Europe/Paris
 
+short_open_tag = Off
+expose_php = Off
+
 log_errors = On
 display_startup_errors = On
 display_errors = On
-error_reporting = E_ALL & ~E_DEPRECATED & ~E_NOTICE
+error_reporting = E_ALL
+
+max_execution_time = 360
+
+# NB: ne peut-être supérieur au memory_limit du php.ini
+memory_limit = 2048M
+
+# NB: post_max_size > upload_max_filesize
+upload_max_filesize = 501M
+post_max_size       = 502M
+
+opcache.enable = 0
 
 xdebug.remote_enable = 1
 xdebug.remote_connect_back = 1
 xdebug.profiler_enable_trigger = 1
 
 xdebug.var_display_max_children = 1024
-xdebug.var_display_max_data = 1024
+xdebug.var_display_max_data = -1
 xdebug.max_nesting_level = 256
 # Attention: trop diminuer 'max_nesting_level' peut causer une erreur 'Maximum function nesting level of x reached'
+
 #xdebug.collect_params = 4
 
-apc.enabled = 1