Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Remove bcrypt, continued.

Browse source
This commit is contained in:
Lauri Ojansivu 2018-05-26 08:28:16 +03:00
parent 73c4806864
commit 4d193f5650
2 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Dockerfile
View file

@ -125,12 +125,15 @@ RUN \
gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \ 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 && \ 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 && \ 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 && \ #Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
gosu wekan:wekan rm -rf node_modules/bcrypt && \ #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
gosu wekan:wekan npm install bcrypt && \ #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/ && \ cd /home/wekan/app_build/bundle/programs/server/ && \
gosu wekan:wekan npm install && \ gosu wekan:wekan npm install && \
gosu wekan:wekan npm install bcrypt && \ #gosu wekan:wekan npm install bcrypt && \
mv /home/wekan/app_build/bundle /build && \ mv /home/wekan/app_build/bundle /build && \
\ \
# Cleanup # Cleanup

15
snapcraft.yaml
View file

@ -140,13 +140,18 @@ parts:
meteor npm install --allow-superuser meteor npm install --allow-superuser
meteor build .build --directory --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 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 #Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
rm -rf node_modules/bcrypt #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
meteor npm install --save bcrypt #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 # Change to directory .build/bundle/programs/server
cd ../../../../ cd .build/bundle/programs/server
npm install npm install
meteor npm install --save bcrypt #meteor npm install --save bcrypt
# Change back to Wekan source directory # Change back to Wekan source directory
cd ../../../.. cd ../../../..
cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/ cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/