diff options
-rw-r--r-- | Dockerfile | 11 | ||||
-rw-r--r-- | snapcraft.yaml | 15 |
2 files changed, 17 insertions, 9 deletions
@@ -125,12 +125,15 @@ RUN \ gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \ cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ chown wekan:wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ - cd /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt && \ - gosu wekan:wekan rm -rf node_modules/bcrypt && \ - gosu wekan:wekan npm install 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 /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt && \ + #gosu wekan:wekan rm -rf node_modules/bcrypt && \ + #gosu wekan:wekan npm install bcrypt && \ cd /home/wekan/app_build/bundle/programs/server/ && \ gosu wekan:wekan npm install && \ - gosu wekan:wekan npm install bcrypt && \ + #gosu wekan:wekan npm install bcrypt && \ mv /home/wekan/app_build/bundle /build && \ \ # Cleanup diff --git a/snapcraft.yaml b/snapcraft.yaml index b2ed9b8c..5384bf80 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -140,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/ |