diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index db8a012a6..ff3880d69 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -142,8 +142,9 @@ ENV \ SAML_IDENTIFIER_FORMAT="" \ SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE="" \ SAML_ATTRIBUTES="" \ - DEFAULT_WAIT_SPINNER="" \ - NODE_OPTIONS="--max_old_space_size=4096" + DEFAULT_WAIT_SPINNER="" +# \ +# NODE_OPTIONS="--max_old_space_size=4096" #--------------------------------------------------------------------- # https://github.com/wekan/wekan/issues/3585#issuecomment-1021522132 diff --git a/Dockerfile b/Dockerfile index 29b8543cd..d950d6510 100644 --- a/Dockerfile +++ b/Dockerfile @@ -157,9 +157,10 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build- SAML_ATTRIBUTES="" \ ORACLE_OIM_ENABLED=false \ WAIT_SPINNER="" \ - NODE_OPTIONS="--max_old_space_size=4096" \ WRITABLE_PATH=/data +# NODE_OPTIONS="--max_old_space_size=4096" \ + #--------------------------------------------- # == at docker-compose.yml: AUTOLOGIN WITH OIDC/OAUTH2 ==== # https://github.com/wekan/wekan/wiki/autologin @@ -269,4 +270,5 @@ STOPSIGNAL SIGKILL # # CMD ["node", "/build/main.js"] -CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 /build/main.js"] +#CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 /build/main.js"] +CMD ["bash", "-c", "ulimit -s 65500; exec node /build/main.js"] diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8 index 3b05bb80e..6e347e46e 100644 --- a/Dockerfile.arm64v8 +++ b/Dockerfile.arm64v8 @@ -93,5 +93,6 @@ USER wekan # #CMD ["node", "/home/wekan/bundle/main.js"] -CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 /home/wekan/bundle/main.js"] +#CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 /home/wekan/bundle/main.js"] +CMD ["bash", "-c", "ulimit -s 65500; exec node /home/wekan/bundle/main.js"] diff --git a/package-lock.json b/package-lock.json index 1f70eded5..b2e9eaab9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -235,9 +235,9 @@ } }, "@braintree/sanitize-url": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-6.0.1.tgz", - "integrity": "sha512-zr9Qs9KFQiEvMWdZesjcmRJlUck5NR+eKGS1uyKk+oYTWwlYrsoPEi6VmG6/TzBD1hKCGEimrhTgGS6hvn/xIQ==" + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-6.0.2.tgz", + "integrity": "sha512-Tbsj02wXCbqGmzdnXNk0SOF19ChhRU70BsroIi4Pm6Ehp56in6vch94mfbdQ17DozxkL3BAVjbZ4Qc1a0HFRAg==" }, "@fast-csv/format": { "version": "4.3.5", @@ -390,9 +390,9 @@ "integrity": "sha512-B9EoJFjhqcQ9OmQrNorItO+OwEOORNn3S31WuiHvZY/dm9ajkB7AKD/8toessEtHHNL+58jofbq7hMMY9v4yig==" }, "@wekanteam/cli-table3": { - "version": "0.7.8", - "resolved": "https://registry.npmjs.org/@wekanteam/cli-table3/-/cli-table3-0.7.8.tgz", - "integrity": "sha512-x2ZzgTMx6+J8nYFV4KBJyyxF6tj4jXF7rf3xYxcUbJgxy34xFxFzHbkOtDg8n1ra3Nb6lN2M3Hi4ANIf+lmJxA==", + "version": "0.7.9", + "resolved": "https://registry.npmjs.org/@wekanteam/cli-table3/-/cli-table3-0.7.9.tgz", + "integrity": "sha512-Y5Hs8Ekf9WABzolTmqj3zyzzSRl/olpQB/1cw/ksIYiVNYwCq9yoptdPEMM8PI7FiQPfV3baA4SehpNNDudQ7w==", "requires": { "string-width": "^5.1.2" }, @@ -428,12 +428,12 @@ } }, "@wekanteam/markdown-it-mermaid": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/@wekanteam/markdown-it-mermaid/-/markdown-it-mermaid-0.5.9.tgz", - "integrity": "sha512-IYl7956/GoBnJaQz0n97PmODFHLXAp+sfDphUw8aw38Cox8/UWa/NCcOtZgpWFg6yvCqFiwj/+s82oZA8J4ALg==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@wekanteam/markdown-it-mermaid/-/markdown-it-mermaid-0.6.0.tgz", + "integrity": "sha512-Epvbbe5ipNlC8Wlw+g2EdUQpBniGMIS0I1JnG0+DVsFdWAkrWcroT9YDIRLHsHr1ytg+e1xAyTgbvgkgMHiPRA==", "requires": { - "@wekanteam/cli-table3": "^0.7.8", - "mermaid": "^9.2.0" + "@wekanteam/cli-table3": "^0.7.9", + "mermaid": "^9.2.2" } }, "abbrev": { @@ -2463,9 +2463,9 @@ "integrity": "sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==" }, "mermaid": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-9.2.0.tgz", - "integrity": "sha512-iWKTBjHoPUSs+mJMpZ5+K9xg97KflKjbv91Bu42yK2jjz4wX4Nt1eshi+bmmFWAhn7f2R0X55hlxxbSxdp0QYA==", + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-9.2.2.tgz", + "integrity": "sha512-6s7eKMqFJGS+0MYjmx8f6ZigqKBJVoSx5ql2gw6a4Aa+WJ49QiEJg7gPwywaBg3DZMs79UP7trESp4+jmaQccw==", "requires": { "@braintree/sanitize-url": "^6.0.0", "d3": "^7.0.0", diff --git a/package.json b/package.json index 0048498a4..8d1ab4daa 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@babel/core": "^7.15.5", "@babel/runtime": "^7.15.4", "@mapbox/node-pre-gyp": "^1.0.8", - "@wekanteam/markdown-it-mermaid": "^0.5.9", + "@wekanteam/markdown-it-mermaid": "^0.6.0", "ajv": "^6.12.6", "babel-runtime": "^6.26.0", "bcryptjs": "^2.4.3", diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index caeaa5dd2..ee9206b83 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -114,12 +114,14 @@ do ;; "Run Meteor for dev on http://localhost:4000") - WRITABLE_PATH=.. NODE_OPTIONS="--max_old_space_size=4096 --trace-warnings" WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://localhost:4000 meteor run --exclude-archs web.browser.legacy,web.cordova --port 4000 + #WRITABLE_PATH=.. NODE_OPTIONS="--max_old_space_size=4096 --trace-warnings" WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://localhost:4000 meteor run --exclude-archs web.browser.legacy,web.cordova --port 4000 + WRITABLE_PATH=.. NODE_OPTIONS="--trace-warnings" WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://localhost:4000 meteor run --exclude-archs web.browser.legacy,web.cordova --port 4000 break ;; "Run Meteor for dev on http://localhost:4000 with bundle visualizer") - WRITABLE_PATH=.. NODE_OPTIONS="--max_old_space_size=4096 --trace-warnings" WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://localhost:4000 meteor run --exclude-archs web.browser.legacy,web.cordova --port 4000 --extra-packages bundle-visualizer --production + #WRITABLE_PATH=.. NODE_OPTIONS="--max_old_space_size=4096 --trace-warnings" WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://localhost:4000 meteor run --exclude-archs web.browser.legacy,web.cordova --port 4000 --extra-packages bundle-visualizer --production + WRITABLE_PATH=.. NODE_OPTIONS="--trace-warnings" WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://localhost:4000 meteor run --exclude-archs web.browser.legacy,web.cordova --port 4000 --extra-packages bundle-visualizer --production break ;; @@ -130,7 +132,8 @@ do IPADDRESS=$(ip a | grep 'noprefixroute' | grep 'inet ' | cut -d: -f2 | awk '{ print $2}' | cut -d '/' -f 1) fi echo "Your IP address is $IPADDRESS" - WRITABLE_PATH=.. NODE_OPTIONS="--max_old_space_size=4096 --trace-warnings" WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://$IPADDRESS:4000 meteor run --exclude-archs web.browser.legacy,web.cordova --port 4000 + #WRITABLE_PATH=.. NODE_OPTIONS="--max_old_space_size=4096 --trace-warnings" WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://$IPADDRESS:4000 meteor run --exclude-archs web.browser.legacy,web.cordova --port 4000 + WRITABLE_PATH=.. NODE_OPTIONS="--trace-warnings" WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://$IPADDRESS:4000 meteor run --exclude-archs web.browser.legacy,web.cordova --port 4000 break ;; @@ -141,7 +144,8 @@ do echo "On what port you would like to run Wekan?" read PORT echo "ROOT_URL=http://$IPADDRESS:$PORT" - WRITABLE_PATH=.. NODE_OPTIONS="--max_old_space_size=4096 --trace-warnings" WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://$IPADDRESS:$PORT meteor run --exclude-archs web.browser.legacy,web.cordova --port $PORT + #WRITABLE_PATH=.. NODE_OPTIONS="--max_old_space_size=4096 --trace-warnings" WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://$IPADDRESS:$PORT meteor run --exclude-archs web.browser.legacy,web.cordova --port $PORT + WRITABLE_PATH=.. NODE_OPTIONS="--trace-warnings" WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://$IPADDRESS:$PORT meteor run --exclude-archs web.browser.legacy,web.cordova --port $PORT break ;; diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index b748d1092..5a8b29816 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -228,7 +228,8 @@ const pkgdef :Spk.PackageDefinition = ( const myCommand :Spk.Manifest.Command = ( # Here we define the command used to start up your server. #argv = ["/sandstorm-http-bridge", "4000", "--", "node", "start.js"], - argv = ["/sandstorm-http-bridge", "4000", "--", "node", "--stack-size=65500", "start.js"], + #argv = ["/sandstorm-http-bridge", "4000", "--", "node", "--stack-size=65500", "start.js"], + argv = ["/sandstorm-http-bridge", "4000", "--", "node", "start.js"], environ = [ # Note that this defines the *entire* environment seen by your app. #--------------------------------------------------------------------- diff --git a/snap-src/bin/wekan-control b/snap-src/bin/wekan-control index 27138579f..e4260851d 100755 --- a/snap-src/bin/wekan-control +++ b/snap-src/bin/wekan-control @@ -35,4 +35,5 @@ cd $APPLICATION_DIRECTORY # Add more stack: # bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js" #--------------------------------------------------------------------- -bash -c "ulimit -s 65500; exec $NODE_PATH/node --stack-size=65500 $APPLICATION_START" +#bash -c "ulimit -s 65500; exec $NODE_PATH/node --stack-size=65500 $APPLICATION_START" +bash -c "ulimit -s 65500; exec $NODE_PATH/node $APPLICATION_START" diff --git a/stacksmith/user-scripts/run.sh b/stacksmith/user-scripts/run.sh index 6fe14b872..1e9d3b460 100755 --- a/stacksmith/user-scripts/run.sh +++ b/stacksmith/user-scripts/run.sh @@ -22,6 +22,7 @@ echo "starting the wekan service..." # Add more Node heap: export NODE_OPTIONS="--max_old_space_size=4096" # Add more stack: -bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js" +#bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js" +bash -c "ulimit -s 65500; exec node main.js" #--------------------------------------------------------------------- #node main.js diff --git a/start-wekan.bat b/start-wekan.bat index 58b7e0871..21bade22b 100644 --- a/start-wekan.bat +++ b/start-wekan.bat @@ -482,7 +482,8 @@ REM SET WAIT_SPINNER=Bounce REM # https://github.com/wekan/wekan/issues/3585#issuecomment-1021522132 REM # Add more Node heap: -SET NODE_OPTIONS="--max_old_space_size=4096" +REM # SET NODE_OPTIONS="--max_old_space_size=4096" REM # Add more stack. ulimit is not at Windows, stack-size is at Windows: REM # bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js" -node --stack-size=65500 main.js +REM #node --stack-size=65500 main.js +node main.js diff --git a/start-wekan.sh b/start-wekan.sh index 4b9eaef7b..5828df82f 100755 --- a/start-wekan.sh +++ b/start-wekan.sh @@ -524,10 +524,11 @@ #--------------------------------------------------------------------- # https://github.com/wekan/wekan/issues/3585#issuecomment-1021522132 # Add more Node heap: - export NODE_OPTIONS="--max_old_space_size=4096" + #export NODE_OPTIONS="--max_old_space_size=4096" # Add more stack: #bash -c "ulimit -s 65500; exec node --stack-size=65500 --trace-deprecation main.js" - bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js" + #bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js" + bash -c "ulimit -s 65500; exec node main.js" #node main.js #--------------------------------------------------------------------- # & >> ../../wekan.log