diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-09-25 00:33:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 00:33:49 +0300 |
| commit | 209da19566313c7e167336bc771740cc7e083358 (patch) | |
| tree | 6dace61ec7979aea6c8814259fe7d7c4c105e5e3 | |
| parent | 4dd66eed8e59ae93225e2908239842aeabc39f10 (diff) | |
| parent | b342cfed3abaeb72a3b0b6c8de0ab4240cce2da7 (diff) | |
| download | wekan-209da19566313c7e167336bc771740cc7e083358.tar.gz wekan-209da19566313c7e167336bc771740cc7e083358.tar.bz2 wekan-209da19566313c7e167336bc771740cc7e083358.zip | |
Merge pull request #1913 from ppoulard/devel
Add CAS with attributes
| -rw-r--r-- | .meteor/packages | 2 | ||||
| -rw-r--r-- | .meteor/versions | 2 | ||||
| -rw-r--r-- | Dockerfile | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/.meteor/packages b/.meteor/packages index 990f8717..cf859f61 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -84,7 +84,7 @@ cfs:gridfs eluck:accounts-lockout rzymek:fullcalendar momentjs:moment@2.22.2 -atoy40:accounts-cas browser-policy-framing mquandalle:moment msavin:usercache +ppoulard:accounts-cas diff --git a/.meteor/versions b/.meteor/versions index 504e8aa1..c318eebe 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -9,7 +9,6 @@ aldeed:simple-schema@1.5.3 alethes:pages@1.8.6 allow-deny@1.1.0 arillo:flow-router-helpers@0.5.2 -atoy40:accounts-cas@0.0.2 audit-argument-checks@1.0.7 autoupdate@1.3.12 babel-compiler@6.24.7 @@ -129,6 +128,7 @@ peerlibrary:blaze-components@0.15.1 peerlibrary:computed-field@0.7.0 peerlibrary:reactive-field@0.3.0 perak:markdown@1.0.5 +ppoulard:accounts-cas@0.1.0 promise@0.10.0 raix:eventemitter@0.1.3 raix:handlebar-helpers@0.2.5 @@ -148,6 +148,7 @@ RUN \ cd /home/wekan/app/packages && \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.git kadira-flow-router && \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \ + gosu wekan:wekan git clone --depth 1 -b master git://github.com/ppoulard/meteor-accounts-cas.git meteor-accounts-cas && \ sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \ cd /home/wekan/.meteor && \ gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \ @@ -155,6 +156,8 @@ RUN \ # Build app cd /home/wekan/app && \ gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \ + # adding CAS + gosu wekan:wekan /home/wekan/.meteor/meteor add ppoulard:accounts-cas && \ 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 && \ |