Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2018-01-25 17:54:34 +01:00 · 2018-01-25 17:54:34 +01:00 · 7f21b8a566
commit 7f21b8a566
parent 9a317018e2 89ab37f1bf
3 changed files with 5 additions and 2 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1,5 +1,7 @@
 data
 Dockerfile
 docker-compose.yml
+.dockerignore
 .git
-.gitignore
+.gitignore
+node_modules
--- a/.travis.yml
+++ b/.travis.yml
@ -9,3 +9,4 @@ node_js:
 script:
  - npm run-script lint
  - npm run-script flow
+  - docker build -t xwiki/cryptpad .
--- a/2
+++ b/2
@ -4,7 +4,7 @@ COPY . /cryptpad
 WORKDIR /cryptpad

 RUN apk add --no-cache git tini \
-   && npm install \
+   && npm install --production \
   && npm install -g bower \
   && bower install --allow-root