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

This commit is contained in:
yflory 2018-01-25 17:54:34 +01:00
commit 7f21b8a566
3 changed files with 5 additions and 2 deletions

View File

@ -1,5 +1,7 @@
data data
Dockerfile Dockerfile
docker-compose.yml docker-compose.yml
.dockerignore
.git .git
.gitignore .gitignore
node_modules

View File

@ -9,3 +9,4 @@ node_js:
script: script:
- npm run-script lint - npm run-script lint
- npm run-script flow - npm run-script flow
- docker build -t xwiki/cryptpad .

View File

@ -4,7 +4,7 @@ COPY . /cryptpad
WORKDIR /cryptpad WORKDIR /cryptpad
RUN apk add --no-cache git tini \ RUN apk add --no-cache git tini \
&& npm install \ && npm install --production \
&& npm install -g bower \ && npm install -g bower \
&& bower install --allow-root && bower install --allow-root