2
0
Эх сурвалжийг харах

Fix bson error on Docker. Closes #1009

Lauri Ojansivu 8 жил өмнө
parent
commit
3e98e8c9fb

+ 4 - 0
Dockerfile

@@ -94,6 +94,10 @@ RUN \
     gosu wekan /home/wekan/.meteor/meteor add standard-minifier-js && \
     gosu wekan /home/wekan/.meteor/meteor add standard-minifier-js && \
     gosu wekan /home/wekan/.meteor/meteor npm install && \
     gosu wekan /home/wekan/.meteor/meteor npm install && \
     gosu wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \
     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/ && \
     cd /home/wekan/app_build/bundle/programs/server/ && \
     gosu wekan npm install && \
     gosu wekan npm install && \
     mv /home/wekan/app_build/bundle /build && \
     mv /home/wekan/app_build/bundle /build && \

+ 2 - 2
docker-compose.yml

@@ -3,7 +3,7 @@ version: '2'
 services:
 services:
 
 
   wekandb:
   wekandb:
-    image: mongo:3.2.12
+    image: mongo:3.2.13
     container_name: wekan-db
     container_name: wekan-db
     restart: always
     restart: always
     command: mongod --smallfiles --oplogSize 128
     command: mongod --smallfiles --oplogSize 128
@@ -16,7 +16,7 @@ services:
       - wekan-db-dump:/dump
       - wekan-db-dump:/dump
 
 
   wekan:
   wekan:
-    image: mquandalle/wekan:latest
+    image: wekanteam/meteor-1.4:latest
     container_name: wekan-app
     container_name: wekan-app
     restart: always
     restart: always
     networks:
     networks: