diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-04-27 14:03:49 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-04-27 14:03:49 +0300 |
commit | be61904a1e67fcbedf03076d9c6495315193ff32 (patch) | |
tree | 12e166b7f3c9bdcf18a9502bde850fc98acd5839 /snapcraft.yaml | |
parent | b7247f8d521ccf77c05469ce9585956f386d5ad0 (diff) | |
parent | 170acf694875d1489f9d1df874dbb647cbb92e1a (diff) | |
download | wekan-be61904a1e67fcbedf03076d9c6495315193ff32.tar.gz wekan-be61904a1e67fcbedf03076d9c6495315193ff32.tar.bz2 wekan-be61904a1e67fcbedf03076d9c6495315193ff32.zip |
Merge branch 'devel'
Diffstat (limited to 'snapcraft.yaml')
-rw-r--r-- | snapcraft.yaml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/snapcraft.yaml b/snapcraft.yaml index cbd2fca2..3c1dbb4e 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -96,7 +96,7 @@ parts: - npm - curl - execstack - prepare: | + override-build: | echo "Cleaning environment first" rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules # Node Fibers 100% CPU usage issue: @@ -133,19 +133,18 @@ parts: git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' meteor-useraccounts-core/package.js cd .. - build: | rm -rf package-lock.json .build meteor add standard-minifier-js --allow-superuser 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 + oldpath=`pwd` cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt rm -rf node_modules/bcrypt meteor npm install --save bcrypt - cd ../../../../ + cd $oldpath npm install meteor npm install --save bcrypt - install: | cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/ cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/ rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan @@ -159,7 +158,7 @@ parts: caddy: plugin: dump - source: https://caddyserver.com/download/linux/amd64?license=personal&plugins= + source: https://caddyserver.com/download/linux/amd64?license=personal source-type: tar organize: caddy: bin/caddy |