diff options
Diffstat (limited to 'snapcraft.yaml')
| -rw-r--r-- | snapcraft.yaml | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/snapcraft.yaml b/snapcraft.yaml index d9250392..2333f5db 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -83,7 +83,7 @@ parts: plugin: nodejs node-engine: 8.11.1 node-packages: - - npm@6.0.1 + - npm - node-gyp - node-pre-gyp - fibers@2.0.0 @@ -96,6 +96,8 @@ parts: - npm - curl - execstack + stage-packages: + - libfontconfig1 override-build: | echo "Cleaning environment first" rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules @@ -138,13 +140,18 @@ parts: meteor npm install --allow-superuser meteor build .build --directory --allow-superuser cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js - cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt - rm -rf node_modules/bcrypt - meteor npm install --save bcrypt + #Removed binary version of bcrypt because of security vulnerability that is not fixed yet. + #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac + #https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c + #cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt + #rm -rf node_modules/bcrypt + #meteor npm install --save bcrypt + # Change from npm-bcrypt directory back to .build/bundle/programs/server directory. + #cd ../../../../ # Change to directory .build/bundle/programs/server - cd ../../../../ + cd .build/bundle/programs/server npm install - meteor npm install --save bcrypt + #meteor npm install --save bcrypt # Change back to Wekan source directory cd ../../../.. cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/ @@ -153,6 +160,8 @@ parts: execstack --clear-execstack $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs organize: README: README.wekan + prime: + - -lib/node_modules/node-pre-gyp/node_modules/tar/lib/.unpack.js.swp helpers: source: snap-src |