From c6d6ac41485969ea5bcf13504d2dde9f3b752764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Alfonsi?= <cedric@passbolt.com>
Date: Wed, 25 Oct 2017 17:51:19 +0200
Subject: [PATCH] PASSBOLT-2434 Add npm dependencies for development

---
 Dockerfile         | 14 ++++++++++----
 conf/passbolt.conf |  4 +++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3a0d25c..9ff8b32 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,10 +27,8 @@ ARG BASE_PHP_DEPS="php7-curl \
       php7-iconv \
       php7-mbstring"
 
-ARG BASE_PHP_DEV_DEPS="php7-tokenizer \
-    php7-xmlwriter \
-    php7-simplexml \
-    php7-xdebug"
+ARG BASE_NODE_DEPS="nodejs \
+    nodejs-npm"
 
 ARG PHP_GNUPG_DEPS="php7-dev \
       make \
@@ -44,7 +42,15 @@ ARG PHP_GNUPG_DEPS="php7-dev \
       zlib-dev \
       file"
 
+ARG BASE_PHP_DEV_DEPS="php7-tokenizer \
+    php7-xmlwriter \
+    php7-simplexml \
+    php7-xdebug \
+    git \
+    openssh"
+
 RUN apk add --no-cache $BASE_PHP_DEPS \
+      $BASE_NODE_DEPS \
       $BASE_PHP_DEV_DEPS \
       sed \
       tar \
diff --git a/conf/passbolt.conf b/conf/passbolt.conf
index 773e5c5..a522ff4 100644
--- a/conf/passbolt.conf
+++ b/conf/passbolt.conf
@@ -39,10 +39,11 @@ server {
     fastcgi_param           SERVER_NAME $http_host;
   }
 
-  location ~* \.(jpe?g|woff|woff2|ttf|gif|png|bmp|ico|css|js|json|pdf|zip|htm|html|docx?|xlsx?|pptx?|txt|wav|swf|svg|avi|mp\d)$ {
+  location ~* \.(jpe?g|woff|woff2|ttf|gif|png|bmp|ico|css|js|ejs|json|pdf|zip|htm|html|docx?|xlsx?|pptx?|txt|wav|swf|svg|avi|mp\d)$ {
     access_log off;
     log_not_found off;
     try_files $uri /webroot/$uri /index.php?$args;
+    #try_files $uri /app/webroot/$uri /index.php?$args;
   }
 
 }
@@ -94,5 +95,6 @@ server {
     access_log off;
     log_not_found off;
     try_files $uri /webroot/$uri /index.php?$args;
+    #try_files $uri /app/webroot/$uri /index.php?$args;
   }
 }