CommunEu
/
Passbolt
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PASSBOLT-2434 Add npm dependencies for development

This commit is contained in:
Cédric Alfonsi 2017-10-25 17:51:19 +02:00
parent 4c3c18551b
commit c6d6ac4148
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@ -27,10 +27,8 @@ ARG BASE_PHP_DEPS="php7-curl \
php7-iconv \ php7-iconv \
php7-mbstring" php7-mbstring"
ARG BASE_PHP_DEV_DEPS="php7-tokenizer \ ARG BASE_NODE_DEPS="nodejs \
php7-xmlwriter \ nodejs-npm"
php7-simplexml \
php7-xdebug"
ARG PHP_GNUPG_DEPS="php7-dev \ ARG PHP_GNUPG_DEPS="php7-dev \
make \ make \
@ -44,7 +42,15 @@ ARG PHP_GNUPG_DEPS="php7-dev \
zlib-dev \ zlib-dev \
file" file"
ARG BASE_PHP_DEV_DEPS="php7-tokenizer \
php7-xmlwriter \
php7-simplexml \
php7-xdebug \
git \
openssh"
RUN apk add --no-cache $BASE_PHP_DEPS \ RUN apk add --no-cache $BASE_PHP_DEPS \
$BASE_NODE_DEPS \
$BASE_PHP_DEV_DEPS \ $BASE_PHP_DEV_DEPS \
sed \ sed \
tar \ tar \

4
conf/passbolt.conf
View File

@ -39,10 +39,11 @@ server {
fastcgi_param SERVER_NAME $http_host; 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; access_log off;
log_not_found off; log_not_found off;
try_files $uri /webroot/$uri /index.php?$args; 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; access_log off;
log_not_found off; log_not_found off;
try_files $uri /webroot/$uri /index.php?$args; try_files $uri /webroot/$uri /index.php?$args;
#try_files $uri /app/webroot/$uri /index.php?$args;
} }
} }