summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-10-10 01:38:59 +0300
committerLauri Ojansivu <x@xet7.org>2018-10-10 01:38:59 +0300
commitf599391419bc7422a6ead52cdefc7d380e787897 (patch)
tree705653c7fc3adbaf6b2958ee37fc0985b62985ba
parentab0e1b32039268d52f596c03a19e177999954fda (diff)
downloadwekan-f599391419bc7422a6ead52cdefc7d380e787897.tar.gz
wekan-f599391419bc7422a6ead52cdefc7d380e787897.tar.bz2
wekan-f599391419bc7422a6ead52cdefc7d380e787897.zip
- Add LDAP package to Docker and Snap.
Thanks to xet7 !
-rw-r--r--Dockerfile3
-rw-r--r--snapcraft.yaml5
2 files changed, 7 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 363748a0..542692ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -228,7 +228,8 @@ 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/wekan/meteor-accounts-cas.git meteor-accounts-cas && \
+ gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git && \
+ gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git && \
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; \
diff --git a/snapcraft.yaml b/snapcraft.yaml
index e4276976..c3d3ecff 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -147,6 +147,11 @@ parts:
git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git meteor-accounts-cas
cd ..
fi
+ if [ ! -d "packages/wekan-ldap" ]; then
+ cd packages
+ git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
+ cd ..
+ fi
rm -rf package-lock.json .build
meteor add standard-minifier-js --allow-superuser
meteor npm install --allow-superuser