diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-09-17 20:39:49 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-09-17 20:39:49 +0300 |
| commit | e7a03bb18747f349227fce0fa12f0ececfc009f4 (patch) | |
| tree | a417cec84ace8e6f0c4c759808c01a7f9163f7d2 | |
| parent | 4e21004c42504a584ca7964421f0f6961bc17425 (diff) | |
| download | wekan-e7a03bb18747f349227fce0fa12f0ececfc009f4.tar.gz wekan-e7a03bb18747f349227fce0fa12f0ececfc009f4.tar.bz2 wekan-e7a03bb18747f349227fce0fa12f0ececfc009f4.zip | |
- Use official Node v8.12.0
Thanks to xet7 !
| -rw-r--r-- | Dockerfile | 10 | ||||
| -rw-r--r-- | snapcraft.yaml | 18 |
2 files changed, 14 insertions, 14 deletions
@@ -63,8 +63,8 @@ RUN \ apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \ \ # Download nodejs - #wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ - #wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \ + wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ + wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \ #--------------------------------------------------------------------------------------------- # Node Fibers 100% CPU usage issue: # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161 @@ -73,10 +73,10 @@ RUN \ # Also see beginning of wekan/server/authentication.js # import Fiber from "fibers"; # Fiber.poolSize = 1e9; - # Download node version 8.12.0 prerelease that has fix included, + # OLD: Download node version 8.12.0 prerelease that has fix included, => Official 8.12.0 has been released # Description at https://releases.wekan.team/node.txt - wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ - echo "1ed54adb8497ad8967075a0b5d03dd5d0a502be43d4a4d84e5af489c613d7795 node-v8.12.0-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \ + #wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ + #echo "1ed54adb8497ad8967075a0b5d03dd5d0a502be43d4a4d84e5af489c613d7795 node-v8.12.0-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \ \ # Verify nodejs authenticity grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \ diff --git a/snapcraft.yaml b/snapcraft.yaml index b91a2754..dbe738d0 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -81,7 +81,7 @@ parts: wekan: source: . plugin: nodejs - node-engine: 8.11.3 + node-engine: 8.12.0 node-packages: - npm - node-gyp @@ -108,16 +108,16 @@ parts: # Also see beginning of wekan/server/authentication.js # import Fiber from "fibers"; # Fiber.poolSize = 1e9; - # Download node version 8.12.0 prerelease build, + # OLD: Download node version 8.12.0 prerelease build => Official node 8.12.0 has been released # Description at https://releases.wekan.team/node.txt - echo "375bd8db50b9c692c0bbba6e96d4114cd29bee3770f901c1ff2249d1038f1348 node" >> node-SHASUMS256.txt.asc - curl https://releases.wekan.team/node -o node + ##echo "375bd8db50b9c692c0bbba6e96d4114cd29bee3770f901c1ff2249d1038f1348 node" >> node-SHASUMS256.txt.asc + ##curl https://releases.wekan.team/node -o node # Verify Fibers patched node authenticity - echo "Fibers 100% CPU issue patched node authenticity:" - grep node node-SHASUMS256.txt.asc | shasum -a 256 -c - - rm -f node-SHASUMS256.txt.asc - chmod +x node - mv node `which node` + ##echo "Fibers 100% CPU issue patched node authenticity:" + ##grep node node-SHASUMS256.txt.asc | shasum -a 256 -c - + ##rm -f node-SHASUMS256.txt.asc + ##chmod +x node + ##mv node `which node` # DOES NOT WORK: paxctl fix. # Removed from build-packages: - paxctl #echo "Applying paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303" |