瀏覽代碼

Added building fibers.

Thanks to xet7 !
Lauri Ojansivu 3 年之前
父節點
當前提交
0460a7d9d3
共有 6 個文件被更改,包括 17 次插入2 次删除
  1. 3 1
      .devcontainer/Dockerfile
  2. 2 0
      .devcontainer/build.sh
  3. 3 0
      Dockerfile
  4. 2 0
      rebuild-wekan.sh
  5. 4 1
      snapcraft.yaml
  6. 3 0
      stacksmith/user-scripts/build.sh

+ 3 - 1
.devcontainer/Dockerfile

@@ -238,7 +238,9 @@ RUN \
     set -o xtrace && \
     cd /home/wekan/app_build/bundle/programs/server/ && \
     chmod u+w package.json npm-shrinkwrap.json && \
-    npm install
+    npm install && \
+    cd node_modules/fibers && \
+    node build.js
 
 USER root
 # Cleanup

+ 2 - 0
.devcontainer/build.sh

@@ -9,4 +9,6 @@ cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/pa
 cd .build/bundle/programs/server
 rm -rf node_modules
 /home/wekan/.meteor/meteor npm install
+cd node_modules/fibers
+node build.js
 cd /home/wekan/app

+ 3 - 0
Dockerfile

@@ -307,6 +307,9 @@ RUN \
     cd /home/wekan/app_build/bundle/programs/server/ && \
     chmod u+w *.json && \
     gosu wekan:wekan npm install && \
+    cd node_modules/fibers && \
+    node build.js && \
+    cd ../.. && \
     #gosu wekan:wekan npm install bcrypt && \
     # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
     rm -rf /home/wekan/app_build/bundle/programs/web.browser.legacy && \

+ 2 - 0
rebuild-wekan.sh

@@ -93,6 +93,8 @@ do
 		rm -rf node_modules
                 chmod u+w *.json
 		meteor npm install
+		cd node_modules/fibers
+		node build.js
 		# Cleanup
 		popd
 		find . -type d -name '*-garbage*' | xargs rm -rf

+ 4 - 1
snapcraft.yaml

@@ -86,6 +86,7 @@ parts:
             - node-pre-gyp
             - fibers
         build-packages:
+            - build-essential
             - ca-certificates
             - apt-utils
             - python
@@ -118,7 +119,9 @@ parts:
             cd .build/bundle/programs/server
             chmod u+w *.json
             npm install
-            cd ../../../..
+            cd node_modules/fibers
+            node build.js
+            cd ../../../../../..
             # Cleanup
             cd .build/bundle
             find . -type d -name '*-garbage*' | xargs rm -rf

+ 3 - 0
stacksmith/user-scripts/build.sh

@@ -79,6 +79,9 @@ sudo rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/raj
 rm -rf /home/wekan/app_build/bundle/programs/web.browser.legacy
 cd /home/wekan/app_build/bundle/programs/server/
 sudo npm install
+cd node_modules/fibers
+node build.js
+cd ../..
 sudo chown -R wekan:wekan ./node_modules
 
 #cd /home/wekan/app_build/bundle