diff options
| author | Arthur <arthur@hoa.ro> | 2016-11-08 12:06:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-08 12:06:00 +0100 |
| commit | 8185e864a2c4dbf1a23c27e71100b377b2b9230d (patch) | |
| tree | 6cb0f2a0c2fb7db2142525012dbcf996abc7c5fe /docker/development/Dockerfile | |
| parent | f5f6a4b7e21f39c916fda11eebb1c8df17e1ad4a (diff) | |
| parent | 68579ad5c4d1978366c5d2be2ef34da6a3618ef0 (diff) | |
| download | Shaarli-8185e864a2c4dbf1a23c27e71100b377b2b9230d.tar.gz Shaarli-8185e864a2c4dbf1a23c27e71100b377b2b9230d.tar.zst Shaarli-8185e864a2c4dbf1a23c27e71100b377b2b9230d.zip | |
Merge pull request #684 from virtualtam/fix/docker/nginx
Docker: fix & improve nginx+php-fpm configuration
Diffstat (limited to 'docker/development/Dockerfile')
| -rw-r--r-- | docker/development/Dockerfile | 2 |
1 files changed, 2 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 | ||
| 18 | RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini | ||
| 19 | RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini | ||
| 18 | COPY nginx.conf /etc/nginx/nginx.conf | 20 | COPY nginx.conf /etc/nginx/nginx.conf |
| 19 | COPY supervised.conf /etc/supervisor/conf.d/supervised.conf | 21 | COPY supervised.conf /etc/supervisor/conf.d/supervised.conf |
| 20 | 22 | ||