Docker: increase maximum file upload size to 10 MiB

Relates to https://github.com/shaarli/Shaarli/issues/681

Changed:
- nginx+php-fpm: set maximum upload size to 10 MiB

See:
- https://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size
- https://secure.php.net/manual/en/ini.core.php#ini.post-max-size
- https://secure.php.net/manual/en/ini.core.php#ini.upload-max-filesize

Signed-off-by: VirtualTam <virtualtam@flibidi.net>

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d42d6a75e2fa42c02d9be9e27b763079a8795a94..5eeb521af36466c06b60c67d6b9cccd074540f36 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
     - archives contain a `Shaarli` directory, itself containing sources + dependencies
     - the tarball is now gzipped
 - Minor code cleanup: PHPDoc, spelling, unused variables, etc.
+- Docker: explicitly set the maximum file upload size to 10 MiB
 
 ### Fixed
 - Fix the server `<self>` value in Atom/RSS feeds
@@ -27,6 +28,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
     - Tools: only display parameter description when it exists
     - archive.org: do not propose archival of private notes
 - Use absolute URL for hashtags in RSS and ATOM feeds
+- Docker: specify the location of the favicon
 
 ### Security
 - Allow whitelisting trusted IPs, else continue banning clients upon login failure

diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
index 0c19b0855d0b9d282e04e906cce7d254bab2af3f..d9ef8da7db2eada974c7d6ce6cd6f684583755f6 100644 (file)
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@@ -15,6 +15,8 @@ RUN apt-get update \
        nano \
     && apt-get clean
 
+RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini
+RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
 

diff --git a/docker/development/nginx.conf b/docker/development/nginx.conf
index e714ee76a39e05811304facd3007ba7b54adc42d..ac0c6c61ce165976b7572bb96eb8ba90b5f4d2a8 100644 (file)
--- a/docker/development/nginx.conf
+++ b/docker/development/nginx.conf
@@ -11,6 +11,8 @@ http {
     default_type       application/octet-stream;
     keepalive_timeout  20;
 
+    client_max_body_size 10m;
+
     index index.html index.php;
 
     server {

diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile
index d93ed262b79acd97ce114256aa940a927bf794a4..d0509115c5907e158c52292919b7a87506ae070e 100644 (file)
--- a/docker/production/Dockerfile
+++ b/docker/production/Dockerfile
@@ -14,6 +14,8 @@ RUN apt-get update \
        supervisor \
     && apt-get clean
 
+RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini
+RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
 

diff --git a/docker/production/nginx.conf b/docker/production/nginx.conf
index f7d59fc88c479ccfb58c44c6634b5aa9d09b937e..5ffa02d0a9d570136d4ab7ea8f8bef4107f03cb7 100644 (file)
--- a/docker/production/nginx.conf
+++ b/docker/production/nginx.conf
@@ -11,6 +11,8 @@ http {
     default_type       application/octet-stream;
     keepalive_timeout  20;
 
+    client_max_body_size 10m;
+
     index index.html index.php;
 
     server {

diff --git a/docker/production/stable/Dockerfile b/docker/production/stable/Dockerfile
index a509fda65cfc00fee884127fda3e2433f6adfe9b..fc9588b0d604dd4023a232ef17c4a8d76f26d98b 100644 (file)
--- a/docker/production/stable/Dockerfile
+++ b/docker/production/stable/Dockerfile
@@ -14,6 +14,8 @@ RUN apt-get update \
        supervisor \
     && apt-get clean
 
+RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini
+RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
 

diff --git a/docker/production/stable/nginx.conf b/docker/production/stable/nginx.conf
index f7d59fc88c479ccfb58c44c6634b5aa9d09b937e..5ffa02d0a9d570136d4ab7ea8f8bef4107f03cb7 100644 (file)
--- a/docker/production/stable/nginx.conf
+++ b/docker/production/stable/nginx.conf
@@ -11,6 +11,8 @@ http {
     default_type       application/octet-stream;
     keepalive_timeout  20;
 
+    client_max_body_size 10m;
+
     index index.html index.php;
 
     server {