2 files changed, 28 insertions, 11 deletions

diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
index 2ed59b89..d9ef8da7 100644
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@@ -1,26 +1,36 @@
 FROM debian:jessie
 MAINTAINER Shaarli Community
 
+ENV TERM dumb
 RUN apt-get update \
-    && apt-get install -y \
-       nginx-light php5-fpm php5-gd supervisor \
-       git nano
+    && apt-get install --no-install-recommends -y \
+       ca-certificates \
+       nginx-light \
+       php5-curl \
+       php5-fpm \
+       php5-gd \
+       php5-intl \
+       supervisor \
+       git \
+       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
 
 ADD https://getcomposer.org/composer.phar /usr/local/bin/composer
 RUN chmod 755 /usr/local/bin/composer
 
-COPY nginx.conf /etc/nginx/nginx.conf
-COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
-RUN echo "<?php phpinfo(); ?>" > /var/www/index.php
-
 WORKDIR /var/www
+RUN git clone https://github.com/shaarli/Shaarli.git shaarli \
+    && cd shaarli \
+    && composer --prefer-dist install
 RUN rm -rf html \
-    && git clone https://github.com/shaarli/Shaarli.git shaarli \
+    && echo "<?php phpinfo(); ?>" > index.php \
     && chown -R www-data:www-data .
 
-WORKDIR /var/www/shaarli
-RUN composer install
-
 VOLUME /var/www/shaarli/data
 
 EXPOSE 80
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 {
     default_type       application/octet-stream;
     keepalive_timeout  20;
 
+    client_max_body_size 10m;
+
     index index.html index.php;
 
     server {
@@ -49,6 +51,11 @@ http {
             add_header Cache-Control "public, must-revalidate, proxy-revalidate";
         }
 
+        location = /favicon.ico {
+            # serve the Shaarli favicon from its custom location
+            alias /var/www/shaarli/images/favicon.ico;
+        }
+
         location ~ (index)\.php$ {
             # filter and proxy PHP requests to PHP-FPM
             fastcgi_pass   unix:/var/run/php5-fpm.sock;