summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--.gitmodules7
-rw-r--r--.meteor/packages1
-rw-r--r--Dockerfile6
4 files changed, 8 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 257d8a85..01543813 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,6 @@
tmp/
node_modules/
.vscode/
-.build/* \ No newline at end of file
+.build/*
+packages/kadira-flow-router/
+packages/meteor-useraccounts-core/
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 45032059..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,7 +0,0 @@
-[submodule "packages/kadira:flow-router"]
- path = packages/kadira:flow-router
- url = https://github.com/wekan/flow-router.git
-
-[submodule "packages/useraccounts:core"]
- path = packages/useraccounts:core
- url = https://github.com/meteor-useraccounts/core.git
diff --git a/.meteor/packages b/.meteor/packages
index 5f2a19d4..1705935f 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -77,3 +77,4 @@ rajit:bootstrap3-datepicker
kadira:flow-router
shell-server@0.2.3
simple:rest-accounts-password
+useraccounts:core
diff --git a/Dockerfile b/Dockerfile
index e40b3be8..cc8617aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -94,9 +94,11 @@ RUN \
if [ "$USE_EDGE" = false ]; then \
gosu wekan:wekan sh ./install_meteor.sh; \
else \
- gosu wekan:wekan git clone --recursive git://github.com/meteor/meteor.git /home/wekan/.meteor && \
+ gosu wekan:wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} git://github.com/meteor/meteor.git /home/wekan/.meteor && \
+ cd /home/wekan/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 && \
cd /home/wekan/.meteor && \
- gosu wekan:wekan git checkout release/METEOR@${METEOR_EDGE} && \
gosu wekan /home/wekan/.meteor/meteor -- help; \
fi && \
\