aboutsummaryrefslogtreecommitdiffhomepage
path: root/docker/development
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.net>2016-11-05 20:42:54 +0100
committerVirtualTam <virtualtam@flibidi.net>2016-11-06 00:43:50 +0100
commit68579ad5c4d1978366c5d2be2ef34da6a3618ef0 (patch)
treeed3e704e7f7b2d0f1a28434dfe546a43bdee404e /docker/development
parentb7f8b874bb9f2028c29b1f22f893fabec2836de8 (diff)
downloadShaarli-68579ad5c4d1978366c5d2be2ef34da6a3618ef0.tar.gz
Shaarli-68579ad5c4d1978366c5d2be2ef34da6a3618ef0.tar.zst
Shaarli-68579ad5c4d1978366c5d2be2ef34da6a3618ef0.zip
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>
Diffstat (limited to 'docker/development')
-rw-r--r--docker/development/Dockerfile2
-rw-r--r--docker/development/nginx.conf2
2 files changed, 4 insertions, 0 deletions
diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
index 0c19b085..d9ef8da7 100644
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@@ -15,6 +15,8 @@ RUN apt-get update \
15 nano \ 15 nano \
16 && apt-get clean 16 && apt-get clean
17 17
18RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini
19RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini
18COPY nginx.conf /etc/nginx/nginx.conf 20COPY nginx.conf /etc/nginx/nginx.conf
19COPY supervised.conf /etc/supervisor/conf.d/supervised.conf 21COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
20 22
diff --git a/docker/development/nginx.conf b/docker/development/nginx.conf
index e714ee76..ac0c6c61 100644
--- a/docker/development/nginx.conf
+++ b/docker/development/nginx.conf
@@ -11,6 +11,8 @@ http {
11 default_type application/octet-stream; 11 default_type application/octet-stream;
12 keepalive_timeout 20; 12 keepalive_timeout 20;
13 13
14 client_max_body_size 10m;
15
14 index index.html index.php; 16 index index.html index.php;
15 17
16 server { 18 server {