diff options
author | VirtualTam <virtualtam@flibidi.net> | 2016-11-05 20:42:54 +0100 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2016-11-06 00:43:50 +0100 |
commit | 68579ad5c4d1978366c5d2be2ef34da6a3618ef0 (patch) | |
tree | ed3e704e7f7b2d0f1a28434dfe546a43bdee404e /docker/production | |
parent | b7f8b874bb9f2028c29b1f22f893fabec2836de8 (diff) | |
download | Shaarli-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/production')
-rw-r--r-- | docker/production/Dockerfile | 2 | ||||
-rw-r--r-- | docker/production/nginx.conf | 2 | ||||
-rw-r--r-- | docker/production/stable/Dockerfile | 2 | ||||
-rw-r--r-- | docker/production/stable/nginx.conf | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index d93ed262..d0509115 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile | |||
@@ -14,6 +14,8 @@ RUN apt-get update \ | |||
14 | supervisor \ | 14 | supervisor \ |
15 | && apt-get clean | 15 | && apt-get clean |
16 | 16 | ||
17 | RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini | ||
18 | RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini | ||
17 | COPY nginx.conf /etc/nginx/nginx.conf | 19 | COPY nginx.conf /etc/nginx/nginx.conf |
18 | COPY supervised.conf /etc/supervisor/conf.d/supervised.conf | 20 | COPY supervised.conf /etc/supervisor/conf.d/supervised.conf |
19 | 21 | ||
diff --git a/docker/production/nginx.conf b/docker/production/nginx.conf index f7d59fc8..5ffa02d0 100644 --- a/docker/production/nginx.conf +++ b/docker/production/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 { |
diff --git a/docker/production/stable/Dockerfile b/docker/production/stable/Dockerfile index a509fda6..fc9588b0 100644 --- a/docker/production/stable/Dockerfile +++ b/docker/production/stable/Dockerfile | |||
@@ -14,6 +14,8 @@ RUN apt-get update \ | |||
14 | supervisor \ | 14 | supervisor \ |
15 | && apt-get clean | 15 | && apt-get clean |
16 | 16 | ||
17 | RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini | ||
18 | RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini | ||
17 | COPY nginx.conf /etc/nginx/nginx.conf | 19 | COPY nginx.conf /etc/nginx/nginx.conf |
18 | COPY supervised.conf /etc/supervisor/conf.d/supervised.conf | 20 | COPY supervised.conf /etc/supervisor/conf.d/supervised.conf |
19 | 21 | ||
diff --git a/docker/production/stable/nginx.conf b/docker/production/stable/nginx.conf index f7d59fc8..5ffa02d0 100644 --- a/docker/production/stable/nginx.conf +++ b/docker/production/stable/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 { |