From 2d9e1bdeffb26ee3ae4af00c5079c9febb84e03e Mon Sep 17 00:00:00 2001
From: Bertrand Gauthier <bertrand.gauthier@unicaen.fr>
Date: Fri, 21 Sep 2018 13:37:12 +0200
Subject: [PATCH] =?UTF-8?q?Docker:=20d=C3=A9placement=20de=20la=20config?=
=?UTF-8?q?=20PHP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Dockerfile | 4 +---
docker/fpm/conf.d/app.ini | 3 ---
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index c217bd7..9f9632f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,14 +8,12 @@ RUN ln -sf /dev/stdout /var/log/apache2/access.log
RUN ln -sf /dev/stdout /var/log/apache2/other_vhosts_access.log
RUN ln -sf /dev/stderr /var/log/apache2/error.log
-# Config PHP.
-ADD docker/php.conf ${PHP_CONF_DIR}/fpm/conf.d/sygal-import-ws.ini
-
# Configuration Apache et FPM
ADD docker/apache-ports.conf ${APACHE_CONF_DIR}/ports.conf
ADD docker/apache-site.conf ${APACHE_CONF_DIR}/sites-available/sygal-import-ws.conf
ADD docker/apache-site-ssl.conf ${APACHE_CONF_DIR}/sites-available/sygal-import-ws-ssl.conf
ADD docker/fpm/pool.d/app.conf ${PHP_CONF_DIR}/fpm/pool.d/sygal-import-ws.conf
+ADD docker/fpm/conf.d/app.ini ${PHP_CONF_DIR}/fpm/conf.d/
RUN a2ensite sygal-import-ws sygal-import-ws-ssl && \
service php7.0-fpm reload
diff --git a/docker/fpm/conf.d/app.ini b/docker/fpm/conf.d/app.ini
index 14b06b6..3933509 100644
--- a/docker/fpm/conf.d/app.ini
+++ b/docker/fpm/conf.d/app.ini
@@ -12,9 +12,6 @@ memory_limit = 256M
opcache.enable = 0
-#upload_max_filesize = 51M
-#post_max_size = 60M
-
xdebug.remote_enable = 1
xdebug.remote_connect_back = 1
--
GitLab