[06/26] allura git commit: [#7806] ticket:773 Mount SCM dirs to the host and add some options for the future

[he...@apache.org]

[#7806] ticket:773 Mount SCM dirs to the host and add some options for the future


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/e43ece79
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/e43ece79
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/e43ece79

Branch: refs/heads/hs/7885
Commit: e43ece79da64580e131a730968c473fb4e2210ba
Parents: 15adba6
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu May 21 17:57:03 2015 +0300
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Jun 12 11:43:30 2015 -0400

----------------------------------------------------------------------
 Allura/docker-dev.ini | 12 ++++++++++++
 Dockerfile            |  1 +
 docker-compose.yml    |  5 +++++
 3 files changed, 18 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/e43ece79/Allura/docker-dev.ini
----------------------------------------------------------------------
diff --git a/Allura/docker-dev.ini b/Allura/docker-dev.ini
index 37378a1..f33f264 100644
--- a/Allura/docker-dev.ini
+++ b/Allura/docker-dev.ini
@@ -29,6 +29,18 @@ ming.main.uri = mongodb://mongo:27017/allura
 ming.project.uri = mongodb://mongo:27017/project-data
 ming.task.uri = mongodb://mongo:27017/task
 
+scm.repos.root = /allura-data/scm
+scm.host.ro.git = /allura-data/scm/git$path
+scm.host.rw.git = /allura-data/scm/git$path
+scm.host.ro.hg = /allura-data/scm/hg$path
+scm.host.rw.hg = /allura-data/scm/srv/hg$path
+scm.host.ro.svn = file:///allura-data/scm/svn$path/
+scm.host.rw.svn = file:///allura-data/scm/svn$path/
+
+;solr.server = http://solr:8983/solr
+
+;forgemail.host = smtp
+;forgemail.port = 8825
 
 [filter-app:profile]
 use=egg:keas.profile#profiler

http://git-wip-us.apache.org/repos/asf/allura/blob/e43ece79/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index 1c8e06f..ed8efe0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 FROM ubuntu:12.04
 
 RUN apt-get update && apt-get install -y \
+    git-core \
     python-dev \
     libssl-dev \
     libldap2-dev \

http://git-wip-us.apache.org/repos/asf/allura/blob/e43ece79/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index b64d4d4..0444ba8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,11 @@ web:
     - "8080:8080"
   volumes:
     - .:/allura
+
+    # mounting it separatelly to create git, svn, hg directories automatically
+    - /allura-data/scm/git:/allura-data/scm/git
+    - /allura-data/scm/hg:/allura-data/scm/hg
+    - /allura-data/scm/svn:/allura-data/scm/svn
   links:
     - mongo
 mongo: