diff options
| -rw-r--r-- | .meteor/.finished-upgraders | 1 | ||||
| -rw-r--r-- | .meteor/packages | 43 | ||||
| -rw-r--r-- | .meteor/release | 2 | ||||
| -rw-r--r-- | .meteor/versions | 155 | ||||
| -rw-r--r-- | Dockerfile | 14 | ||||
| -rw-r--r-- | docker-compose.yml | 6 | ||||
| -rw-r--r-- | package.json | 13 | ||||
| -rw-r--r-- | packages/meteorx/package.js | 13 | ||||
| -rwxr-xr-x | rebuild-wekan.sh | 3 | ||||
| -rwxr-xr-x | releases/release-cleanup.sh | 7 | ||||
| -rwxr-xr-x | releases/release-sandstorm.sh | 10 | ||||
| -rw-r--r-- | snapcraft.yaml | 23 | ||||
| -rwxr-xr-x | start-wekan.sh | 17 |
13 files changed, 155 insertions, 152 deletions
diff --git a/.meteor/.finished-upgraders b/.meteor/.finished-upgraders index 2a56593d..8f397c7d 100644 --- a/.meteor/.finished-upgraders +++ b/.meteor/.finished-upgraders @@ -16,3 +16,4 @@ notices-for-facebook-graph-api-2 1.4.1-add-shell-server-package 1.4.3-split-account-service-packages 1.5-add-dynamic-import-package +1.7-split-underscore-from-meteor-base diff --git a/.meteor/packages b/.meteor/packages index 6b771809..a4c9a081 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -3,17 +3,16 @@ # 'meteor add' and 'meteor remove' will edit this file for you, # but you can also edit it by hand. -meteor-base@1.2.0 +meteor-base@1.4.0 # Build system -ecmascript -stylus@2.513.13 -standard-minifier-css@1.3.5 -standard-minifier-js@2.2.0 +ecmascript@0.12.4 +standard-minifier-css@1.5.3 +standard-minifier-js@2.4.1 mquandalle:jade # Polyfills -es5-shim@4.6.15 +es5-shim@4.8.0 # Collections aldeed:collection2 @@ -23,7 +22,7 @@ dburles:collection-helpers idmontie:migrations matb33:collection-hooks matteodem:easy-search -mongo@1.3.1 +mongo@1.6.2 mquandalle:collection-mutations # Account system @@ -36,12 +35,12 @@ wekan-accounts-cas wekan-accounts-oidc # Utilities -check@1.2.5 +check@1.3.1 jquery@1.11.10 -random@1.0.10 -reactive-dict@1.2.0 -session@1.1.7 -tracker@1.1.3 +random@1.1.0 +reactive-dict@1.3.0 +session@1.2.0 +tracker@1.2.0 underscore@1.0.10 3stack:presence alethes:pages @@ -49,13 +48,11 @@ arillo:flow-router-helpers audit-argument-checks@1.0.7 kadira:blaze-layout kadira:dochead -meteorhacks:picker -meteorhacks:subs-manager mquandalle:autofocus ongoworks:speakingurl raix:handlebar-helpers tap:i18n -http@1.3.0 +http@1.4.2 # UI components blaze @@ -70,25 +67,29 @@ templates:tabs verron:autosize simple:json-routes rajit:bootstrap3-datepicker -shell-server@0.3.0 +shell-server@0.4.0 simple:rest-accounts-password useraccounts:core email@1.2.3 horka:swipebox -dynamic-import@0.2.0 +dynamic-import@0.5.1 staringatlights:fast-render mixmax:smart-disconnect -accounts-password@1.5.0 +accounts-password@1.5.1 cfs:gridfs rzymek:fullcalendar momentjs:moment@2.22.2 -browser-policy-framing +browser-policy-framing@1.1.0 mquandalle:moment msavin:usercache wekan-scrollbar mquandalle:perfect-scrollbar -mdg:meteor-apm-agent -meteorhacks:unblock +mdg:meteor-apm-agent@3.2.0-rc.0! +coagmano:stylus lucasantoniassi:accounts-lockout +meteorhacks:subs-manager +meteorhacks:picker +lamhieu:unblock +meteorhacks:aggregate@1.3.0 wekan-markdown diff --git a/.meteor/release b/.meteor/release index 56a7a07f..97064e19 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.6.0.1 +METEOR@1.8.1 diff --git a/.meteor/versions b/.meteor/versions index 187d92c5..1258c1b6 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,29 +1,29 @@ 3stack:presence@1.1.2 -accounts-base@1.4.0 -accounts-oauth@1.1.15 -accounts-password@1.5.0 +accounts-base@1.4.4 +accounts-oauth@1.1.16 +accounts-password@1.5.1 aldeed:collection2@2.10.0 aldeed:collection2-core@1.2.0 aldeed:schema-deny@1.1.0 aldeed:schema-index@1.1.1 -aldeed:simple-schema@1.5.3 +aldeed:simple-schema@1.5.4 alethes:pages@1.8.6 allow-deny@1.1.0 arillo:flow-router-helpers@0.5.2 audit-argument-checks@1.0.7 -autoupdate@1.3.12 -babel-compiler@6.24.7 -babel-runtime@1.1.1 -base64@1.0.10 -binary-heap@1.0.10 -blaze@2.3.2 +autoupdate@1.6.0 +babel-compiler@7.3.4 +babel-runtime@1.3.0 +base64@1.0.11 +binary-heap@1.0.11 +blaze@2.3.3 blaze-tools@1.0.10 -boilerplate-generator@1.3.1 +boilerplate-generator@1.6.0 browser-policy-common@1.0.11 browser-policy-framing@1.1.0 -caching-compiler@1.1.9 -caching-html-compiler@1.1.2 -callback-hook@1.0.10 +caching-compiler@1.2.1 +caching-html-compiler@1.1.3 +callback-hook@1.1.0 cfs:access-point@0.1.49 cfs:base-package@0.0.30 cfs:collection@0.5.5 @@ -36,78 +36,82 @@ cfs:http-publish@0.0.13 cfs:power-queue@0.9.11 cfs:reactive-list@0.0.9 cfs:reactive-property@0.0.4 -cfs:standard-packages@0.5.9 -cfs:storage-adapter@0.2.3 -cfs:tempstore@0.1.5 +cfs:standard-packages@0.5.10 +cfs:storage-adapter@0.2.4 +cfs:tempstore@0.1.6 cfs:upload-http@0.0.20 -cfs:worker@0.1.4 -check@1.2.5 +cfs:worker@0.1.5 +check@1.3.1 chuangbo:cookie@1.1.0 -coffeescript@1.12.7_3 -coffeescript-compiler@1.12.7_3 +coagmano:stylus@2.0.0 +coffeescript@1.0.17 cottz:publish-relations@2.0.8 dburles:collection-helpers@1.1.0 ddp@1.4.0 -ddp-client@2.2.0 -ddp-common@1.3.0 +ddp-client@2.3.3 +ddp-common@1.4.0 ddp-rate-limiter@1.0.7 -ddp-server@2.1.1 +ddp-server@2.3.0 deps@1.0.12 -diff-sequence@1.0.7 -dynamic-import@0.2.1 -ecmascript@0.9.0 -ecmascript-runtime@0.5.0 -ecmascript-runtime-client@0.5.0 -ecmascript-runtime-server@0.5.0 +diff-sequence@1.1.1 +dynamic-import@0.5.1 +ecmascript@0.12.7 +ecmascript-runtime@0.7.0 +ecmascript-runtime-client@0.8.0 +ecmascript-runtime-server@0.7.1 ejson@1.1.0 email@1.2.3 -es5-shim@4.6.15 +es5-shim@4.8.0 fastclick@1.0.13 +fetch@0.1.1 fortawesome:fontawesome@4.7.0 geojson-utils@1.0.10 horka:swipebox@1.0.2 hot-code-push@1.0.4 html-tools@1.0.11 htmljs@1.0.11 -http@1.3.0 -id-map@1.0.9 +http@1.4.2 +id-map@1.1.0 idmontie:migrations@1.0.3 -jquery@1.11.10 +inter-process-messaging@0.1.0 +jquery@1.11.11 kadira:blaze-layout@2.3.0 kadira:dochead@1.5.0 kadira:flow-router@2.12.1 kenton:accounts-sandstorm@0.7.0 +lamhieu:meteorx@2.0.1 +lamhieu:unblock@1.0.0 launch-screen@1.1.1 livedata@1.0.18 localstorage@1.2.0 -logging@1.1.19 +logging@1.1.20 lucasantoniassi:accounts-lockout@1.0.0 matb33:collection-hooks@0.8.4 matteodem:easy-search@1.6.4 -mdg:meteor-apm-agent@3.1.2 +mdg:meteor-apm-agent@3.2.3 mdg:validation-error@0.5.1 -meteor@1.8.2 -meteor-base@1.2.0 +meteor@1.9.3 +meteor-base@1.4.0 meteor-platform@1.2.6 meteorhacks:aggregate@1.3.0 meteorhacks:collection-utils@1.2.0 -meteorhacks:meteorx@1.4.1 meteorhacks:picker@1.0.3 meteorhacks:subs-manager@1.6.4 -meteorhacks:unblock@1.1.0 meteorspark:util@0.2.0 -minifier-css@1.2.16 -minifier-js@2.2.2 +minifier-css@1.4.2 +minifier-js@2.4.1 minifiers@1.1.8-faster-rebuild.0 -minimongo@1.4.3 +minimongo@1.4.5 mixmax:smart-disconnect@0.0.4 mobile-status-bar@1.0.14 -modules@0.11.0 -modules-runtime@0.9.1 -momentjs:moment@2.22.2 -mongo@1.3.1 +modern-browsers@0.1.4 +modules@0.13.0 +modules-runtime@0.10.3 +momentjs:moment@2.24.0 +mongo@1.6.2 +mongo-decimal@0.1.1 mongo-dev-server@1.1.0 -mongo-id@1.0.6 +mongo-id@1.0.7 mongo-livedata@1.0.12 mousetrap:mousetrap@1.4.6_1 mquandalle:autofocus@1.0.0 @@ -121,68 +125,69 @@ mquandalle:mousetrap-bindglobal@0.0.1 mquandalle:perfect-scrollbar@0.6.5_2 msavin:usercache@1.0.0 npm-bcrypt@0.9.3 -npm-mongo@2.2.33 -oauth@1.2.1 -oauth2@1.2.0 +npm-mongo@3.1.2 +oauth@1.2.8 +oauth2@1.2.1 observe-sequence@1.0.16 ongoworks:speakingurl@1.1.0 -ordered-dict@1.0.9 +ordered-dict@1.1.0 peerlibrary:assert@0.2.5 peerlibrary:base-component@0.16.0 peerlibrary:blaze-components@0.15.1 -peerlibrary:computed-field@0.7.0 -peerlibrary:reactive-field@0.3.0 -promise@0.10.0 +peerlibrary:computed-field@0.9.0 +peerlibrary:reactive-field@0.5.0 +promise@0.11.2 raix:eventemitter@0.1.3 raix:handlebar-helpers@0.2.5 -rajit:bootstrap3-datepicker@1.7.1 -random@1.0.10 -rate-limit@1.0.8 -reactive-dict@1.2.0 +rajit:bootstrap3-datepicker@1.7.1_1 +random@1.1.0 +rate-limit@1.0.9 +reactive-dict@1.3.0 reactive-var@1.0.11 -reload@1.1.11 -retry@1.0.9 -routepolicy@1.0.12 +reload@1.3.0 +retry@1.1.0 +routepolicy@1.1.0 rzymek:fullcalendar@3.8.0 +server-render@0.3.1 service-configuration@1.0.11 -session@1.1.7 +session@1.2.0 sha@1.0.9 -shell-server@0.3.1 +shell-server@0.4.0 simple:authenticate-user-by-token@1.0.1 simple:json-routes@2.1.0 simple:rest-accounts-password@1.1.2 simple:rest-bearer-token-parser@1.0.1 simple:rest-json-error-handler@1.0.1 +socket-stream-client@0.2.2 softwarerero:accounts-t9n@1.3.11 spacebars@1.0.15 spacebars-compiler@1.1.3 -srp@1.0.10 -standard-minifier-css@1.3.5 -standard-minifier-js@2.2.3 -staringatlights:fast-render@2.16.5 -staringatlights:inject-data@2.0.5 -stylus@2.513.13 +srp@1.0.12 +standard-minifier-css@1.5.3 +standard-minifier-js@2.4.1 +staringatlights:fast-render@3.2.0 +staringatlights:inject-data@2.3.0 tap:i18n@1.8.2 templates:tabs@2.3.0 templating@1.3.2 templating-compiler@1.3.3 templating-runtime@1.3.2 templating-tools@1.1.2 -tracker@1.1.3 +tracker@1.2.0 ui@1.0.13 underscore@1.0.10 -url@1.1.0 +url@1.2.0 useraccounts:core@1.14.2 useraccounts:flow-routing@1.14.2 useraccounts:unstyled@1.14.2 verron:autosize@3.0.8 -webapp@1.4.0 +webapp@1.7.4 webapp-hashing@1.0.9 +wekan-accounts-cas@0.1.0 wekan-accounts-oidc@1.0.10 +wekan-ldap@0.0.2 wekan-markdown@1.0.7 wekan-oidc@1.0.12 wekan-scrollbar@3.1.3 -wekan-accounts-cas@0.1.0 -wekan-ldap@0.0.2 yasaricli:slugify@0.0.7 zimme:active-route@2.3.2 @@ -7,7 +7,7 @@ LABEL maintainer="wekan" ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python3 python3-pip git ca-certificates gcc-8" \ DEBUG=false \ NODE_VERSION=v8.16.0 \ - METEOR_RELEASE=1.6.0.1 \ + METEOR_RELEASE=1.8.1 \ USE_EDGE=false \ METEOR_EDGE=1.5-beta.17 \ NPM_VERSION=latest \ @@ -178,20 +178,20 @@ RUN \ \ # Change user to wekan and install meteor cd /home/wekan/ && \ - chown wekan:wekan --recursive /home/wekan && \ + chown wekan --recursive /home/wekan && \ curl "https://install.meteor.com" -o /home/wekan/install_meteor.sh && \ #curl "https://install.meteor.com/?release=${METEOR_RELEASE}" -o /home/wekan/install_meteor.sh && \ # OLD: sed -i "s|RELEASE=.*|RELEASE=${METEOR_RELEASE}\"\"|g" ./install_meteor.sh && \ # Install Meteor forcing its progress sed -i 's/VERBOSITY="--silent"/VERBOSITY="--progress-bar"/' ./install_meteor.sh && \ echo "Starting meteor ${METEOR_RELEASE} installation... \n" && \ - chown wekan:wekan /home/wekan/install_meteor.sh && \ + chown wekan /home/wekan/install_meteor.sh && \ \ # Check if opting for a release candidate instead of major release if [ "$USE_EDGE" = false ]; then \ gosu wekan:wekan sh /home/wekan/install_meteor.sh; \ else \ - gosu wekan:wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} git://github.com/meteor/meteor.git /home/wekan/.meteor; \ + gosu wekan:wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} https://github.com/meteor/meteor.git /home/wekan/.meteor; \ fi; \ \ # Get additional packages @@ -216,7 +216,7 @@ RUN \ # extract the OpenAPI specification npm install -g api2html@0.3.3 && \ mkdir -p /home/wekan/python && \ - chown wekan:wekan --recursive /home/wekan/python && \ + chown wekan --recursive /home/wekan/python && \ cd /home/wekan/python && \ gosu wekan:wekan git clone --depth 1 -b master https://github.com/Kronuz/esprima-python && \ cd /home/wekan/python/esprima-python && \ @@ -231,8 +231,8 @@ RUN \ gosu wekan:wekan /home/wekan/.meteor/meteor npm install && \ 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 && \ - rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs && \ - chown wekan:wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ + #rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs && \ + chown wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ #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 diff --git a/docker-compose.yml b/docker-compose.yml index aaeb47b0..44e47b5f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -91,10 +91,10 @@ services: #------------------------------------------------------------------------------------- # ==== MONGODB AND METEOR VERSION ==== # a) For Wekan Meteor 1.8.x version at meteor-1.8 branch, use mongo 4.x - #image: mongo:4.0.4 + image: mongo:4.0.9 # b) For Wekan Meteor 1.6.x version at master/devel/edge branches. # Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x - image: mongo:3.2.21 + #image: mongo:3.2.21 #------------------------------------------------------------------------------------- container_name: wekan-db restart: always @@ -115,7 +115,7 @@ services: #image: quay.io/wekan/wekan:meteor-1.8 # b) For Wekan Meteor 1.6.x version at master/devel/edge branches. # Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x - image: quay.io/wekan/wekan:master + image: quay.io/wekan/wekan:meteor-1.8 # c) Using specific Meteor 1.6.x version tag: # image: quay.io/wekan/wekan:v1.95 # c) Using Docker Hub automatic builds https://hub.docker.com/r/wekanteam/wekan diff --git a/package.json b/package.json index c8123b5f..96667a50 100644 --- a/package.json +++ b/package.json @@ -20,19 +20,20 @@ }, "homepage": "https://wekan.github.io", "devDependencies": { - "eslint": "^4.19.1" + "eslint": "^5.16.0" }, "dependencies": { - "@babel/runtime": "^7.1.2", - "babel-runtime": "^6.26.0", - "bson-ext": "^2.0.0", + "@babel/runtime": "^7.4.3", + "bcrypt": "^3.0.2", + "bson": "^4.0.0", + "bunyan": "^1.8.12", "es6-promise": "^4.2.4", - "hoek": "^5.0.4", + "ldapjs": "^1.0.2", "meteor-node-stubs": "^0.4.1", "os": "^0.1.1", "page": "^1.8.6", "qs": "^6.5.2", - "source-map-support": "^0.5.9", + "source-map-support": "^0.5.12", "xss": "^1.0.3" } } diff --git a/packages/meteorx/package.js b/packages/meteorx/package.js new file mode 100644 index 00000000..0bdad1ca --- /dev/null +++ b/packages/meteorx/package.js @@ -0,0 +1,13 @@ +Package.describe({ + name: 'meteorhacks:meteorx', + summary: 'Proxy for getting another meteorx fork', + version: '1.4.1' +}); + +Package.onUse((api) => { + api.export('MeteorX'); + api.use([ + 'lamhieu:meteorx', + ]); +}); + diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index c473f414..68d869fd 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -104,9 +104,10 @@ do npm_call -g install npm npm_call -g install node-gyp # Latest fibers for Meteor 1.6 - npm_call -g install fibers@2.0.0 + npm_call -g install fibers@3.1.1 # Install Meteor, if it's not yet installed curl https://install.meteor.com | bash + sudo chown -R $USER ~/.meteor break ;; "Build Wekan") diff --git a/releases/release-cleanup.sh b/releases/release-cleanup.sh index ed49638e..79e400d5 100755 --- a/releases/release-cleanup.sh +++ b/releases/release-cleanup.sh @@ -8,12 +8,11 @@ sudo rm -rf parts prime stage .meteor-spk # Set permissions cd ~/repos -sudo chown user:user wekan -R +sudo chown -R $USER wekan cd ~/ -sudo chown user:user .meteor -R -#sudo chown user:user .cache/snapcraft -R +sudo chown -R $USER ~/.meteor sudo rm -rf .cache/snapcraft -sudo chown user:user .config -R +sudo chown -R $USER .config # Back cd ~/repos diff --git a/releases/release-sandstorm.sh b/releases/release-sandstorm.sh index 89dfc4fc..d896a150 100755 --- a/releases/release-sandstorm.sh +++ b/releases/release-sandstorm.sh @@ -1,8 +1,7 @@ # Usage: ./release.sh 1.36 # Delete old stuff -cd ~/repos -./release-cleanup.sh +~/repos/wekan/releases/release-cleanup.sh # Build Source cd ~/repos @@ -12,10 +11,9 @@ cd ~/repos cd ~/repos/wekan meteor-spk pack wekan-$1.spk spk publish wekan-$1.spk -#scp wekan-$1.spk x2:/var/snap/wekan/common/releases.wekan.team/ -scp wekan-$1.spk x2:/var/www/releases.wekan.team/ +scp wekan-$1.spk x2:/var/snap/wekan/common/releases.wekan.team/ +#scp wekan-$1.spk x2:/var/www/releases.wekan.team/ mv wekan-$1.spk .. # Delete old stuff -cd ~/repos -./release-cleanup.sh +~/repos/wekan/releases/release-cleanup.sh diff --git a/snapcraft.yaml b/snapcraft.yaml index 5a1c6b9f..f0ae2e57 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -65,9 +65,9 @@ apps: parts: mongodb: - source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz + source: https://repo.mongodb.org/apt/ubuntu/dists/xenial/mongodb-org/4.0/multiverse/binary-amd64/mongodb-org-server_4.0.9_amd64.deb plugin: dump - stage-packages: [libssl1.0.0] + stage-packages: [libssl1.1] filesets: mongo: - usr @@ -89,14 +89,14 @@ parts: build-packages: - ca-certificates - apt-utils - - python - python3 - - g++ + - gcc-8 - capnproto - curl - execstack - nodejs - npm + - python3-pip stage-packages: - libfontconfig1 override-build: | @@ -106,6 +106,7 @@ parts: rm -rf .build mkdir -p .build/python cd .build/python + pip3 install -U setuptools wheel git clone --depth 1 -b master https://github.com/Kronuz/esprima-python cd esprima-python python3 setup.py install @@ -113,11 +114,11 @@ parts: mkdir -p ./public/api python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml # we temporary need api2html and mkdirp - npm install -g api2html@0.3.0 - npm install -g mkdirp + npm install -g --unsafe-perm api2html@0.3.0 + npm install -g --unsafe-perm mkdirp api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml - npm uninstall -g mkdirp - npm uninstall -g api2html + npm uninstall -g --unsafe-perm mkdirp + npm uninstall -g --unsafe-perm api2html # Node Fibers 100% CPU usage issue: # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161 # https://github.com/meteor/meteor/issues/9796#issuecomment-381676326 @@ -192,7 +193,7 @@ parts: #fi rm -rf package-lock.json .build meteor add standard-minifier-js --allow-superuser - meteor npm install --allow-superuser + meteor npm install --allow-superuser --unsafe-perm meteor build .build --directory --allow-superuser cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js #Removed binary version of bcrypt because of security vulnerability that is not fixed yet. @@ -205,14 +206,14 @@ parts: #cd ../../../../ # Change to directory .build/bundle/programs/server cd .build/bundle/programs/server - npm install + npm install --unsafe-perm #meteor npm install --save bcrypt # Change back to Wekan source directory cd ../../../.. cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/ cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/ rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan - rm $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs + #rm $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: diff --git a/start-wekan.sh b/start-wekan.sh index 25fd9bb1..3437b0a2 100755 --- a/start-wekan.sh +++ b/start-wekan.sh @@ -1,24 +1,7 @@ #!/bin/bash -function wekan_repo_check(){ - git_remotes="$(git remote show 2>/dev/null)" - res="" - for i in $git_remotes; do - res="$(git remote get-url $i | sed 's/.*wekan\/wekan.*/wekan\/wekan/')" - if [[ "$res" == "wekan/wekan" ]]; then - break - fi - done - - if [[ "$res" != "wekan/wekan" ]]; then - echo "$PWD is not a wekan repository" - exit; - fi -} - # If you want to restart even on crash, uncomment while and done lines. #while true; do - wekan_repo_check cd .build/bundle #--------------------------------------------- # Debug OIDC OAuth2 etc. |