summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-05-06 01:17:02 +0300
committerLauri Ojansivu <x@xet7.org>2017-05-06 01:17:02 +0300
commit3e98e8c9fbfe6d1d248fc12e8bbe56afc6b6e55a (patch)
treecb3a9b2e570a45e4872070114b6734716fb9610d
parent5752383d3cf7fa1d26c6b4815d07443bed7df4b3 (diff)
downloadwekan-3e98e8c9fbfe6d1d248fc12e8bbe56afc6b6e55a.tar.gz
wekan-3e98e8c9fbfe6d1d248fc12e8bbe56afc6b6e55a.tar.bz2
wekan-3e98e8c9fbfe6d1d248fc12e8bbe56afc6b6e55a.zip
Fix bson error on Docker. Closes #1009
-rw-r--r--Dockerfile4
-rw-r--r--docker-compose.yml4
2 files changed, 6 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 7023b6fc..8202f9d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -94,6 +94,10 @@ RUN \
gosu wekan /home/wekan/.meteor/meteor add standard-minifier-js && \
gosu wekan /home/wekan/.meteor/meteor npm install && \
gosu wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \
+ gosu wekan sed -i "s|build\/Release\/bson|browser_build\/bson|g" /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/cfs_gridfs/node_modules/mongodb/node_modules/bson/ext/index.js && \
+ cd /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt && \
+ gosu wekan rm -rf node_modules/bcrypt && \
+ gosu wekan npm install bcrypt && \
cd /home/wekan/app_build/bundle/programs/server/ && \
gosu wekan npm install && \
mv /home/wekan/app_build/bundle /build && \
diff --git a/docker-compose.yml b/docker-compose.yml
index e3cad937..db5afb04 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
services:
wekandb:
- image: mongo:3.2.12
+ image: mongo:3.2.13
container_name: wekan-db
restart: always
command: mongod --smallfiles --oplogSize 128
@@ -16,7 +16,7 @@ services:
- wekan-db-dump:/dump
wekan:
- image: mquandalle/wekan:latest
+ image: wekanteam/meteor-1.4:latest
container_name: wekan-app
restart: always
networks: