aboutsummaryrefslogtreecommitdiffhomepage
path: root/docker/development
diff options
context:
space:
mode:
authorArthur <arthur@hoa.ro>2016-11-08 12:06:00 +0100
committerGitHub <noreply@github.com>2016-11-08 12:06:00 +0100
commit8185e864a2c4dbf1a23c27e71100b377b2b9230d (patch)
tree6cb0f2a0c2fb7db2142525012dbcf996abc7c5fe /docker/development
parentf5f6a4b7e21f39c916fda11eebb1c8df17e1ad4a (diff)
parent68579ad5c4d1978366c5d2be2ef34da6a3618ef0 (diff)
downloadShaarli-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')
-rw-r--r--docker/development/Dockerfile2
-rw-r--r--docker/development/nginx.conf7
2 files changed, 9 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 cda09b56..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 {
@@ -49,6 +51,11 @@ http {
49 add_header Cache-Control "public, must-revalidate, proxy-revalidate"; 51 add_header Cache-Control "public, must-revalidate, proxy-revalidate";
50 } 52 }
51 53
54 location = /favicon.ico {
55 # serve the Shaarli favicon from its custom location
56 alias /var/www/shaarli/images/favicon.ico;
57 }
58
52 location ~ (index)\.php$ { 59 location ~ (index)\.php$ {
53 # filter and proxy PHP requests to PHP-FPM 60 # filter and proxy PHP requests to PHP-FPM
54 fastcgi_pass unix:/var/run/php5-fpm.sock; 61 fastcgi_pass unix:/var/run/php5-fpm.sock;