From 8dd1c97d6c814745010b9ccd1bdd68a0d04543f5 Mon Sep 17 00:00:00 2001 From: kpcyrd Date: Tue, 23 Jan 2018 10:28:58 +0100 Subject: [PATCH 1/2] Fix docker build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 96a5ff520..da60937bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 From d2b0c8a5cd85b17aa06f10c5a9bc80b3b27e6820 Mon Sep 17 00:00:00 2001 From: kpcyrd Date: Tue, 23 Jan 2018 10:47:20 +0100 Subject: [PATCH 2/2] Add docker build to travis tests --- .dockerignore | 4 +++- .travis.yml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 880c21fe3..f2099e1fc 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,7 @@ data Dockerfile docker-compose.yml +.dockerignore .git -.gitignore \ No newline at end of file +.gitignore +node_modules diff --git a/.travis.yml b/.travis.yml index d77e49fa1..047f0502e 100644 --- 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 .