Browse Source

Remove submodules and clone them instead, only latest history and one branch. Closes #977

Lauri Ojansivu 8 years ago
parent
commit
f0f27d1b95
4 changed files with 8 additions and 10 deletions
  1. 3 1
      .gitignore
  2. 0 7
      .gitmodules
  3. 1 0
      .meteor/packages
  4. 4 2
      Dockerfile

+ 3 - 1
.gitignore

@@ -5,4 +5,6 @@
 tmp/
 node_modules/
 .vscode/
-.build/*
+.build/*
+packages/kadira-flow-router/
+packages/meteor-useraccounts-core/

+ 0 - 7
.gitmodules

@@ -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

+ 1 - 0
.meteor/packages

@@ -77,3 +77,4 @@ rajit:bootstrap3-datepicker
 kadira:flow-router
 shell-server@0.2.3
 simple:rest-accounts-password
+useraccounts:core

+ 4 - 2
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 && \
     \