allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jetm...@apache.org
Subject [14/35] allura git commit: [#7806] ticket:778 Add conteiners for in/out mail
Date Wed, 17 Jun 2015 15:17:22 GMT
[#7806] ticket:778 Add conteiners for in/out mail


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

Branch: refs/heads/ib/7884
Commit: 25a242ff5a131bfcaafe76f60b0459ded6f93086
Parents: a165692
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Sat May 30 15:00:20 2015 +0300
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Fri Jun 12 11:43:35 2015 -0400

----------------------------------------------------------------------
 Allura/docker-dev.ini |  7 +++++--
 docker-compose.yml    | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/25a242ff/Allura/docker-dev.ini
----------------------------------------------------------------------
diff --git a/Allura/docker-dev.ini b/Allura/docker-dev.ini
index 0ce00eb..d35fd17 100644
--- a/Allura/docker-dev.ini
+++ b/Allura/docker-dev.ini
@@ -43,8 +43,11 @@ scm.repos.tarball.url_prefix = http://localhost:8080/
 
 solr.server = http://solr:8983/solr
 
-;forgemail.host = smtp
-;forgemail.port = 8825
+smtp_server = outmail
+smtp_port = 8826
+
+forgemail.host = 0.0.0.0
+forgemail.port = 8825
 
 [filter-app:profile]
 use=egg:keas.profile#profiler

http://git-wip-us.apache.org/repos/asf/allura/blob/25a242ff/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index 586afed..230b3d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,6 +34,7 @@ web:
   links:
     - mongo
     - solr
+    - outmail
 
 taskd:
   image: allura_web
@@ -44,6 +45,7 @@ taskd:
   links:
     - mongo
     - solr
+    - outmail
 
 solr:
   build: solr_config
@@ -60,3 +62,20 @@ mongo:
     - "27017"
   volumes:
     - /allura-data/mongo:/data/db
+
+outmail:
+  image: allura_web
+  command: python -m smtpd -n -c DebuggingServer 0.0.0.0:8826
+  expose:
+    - "8826"
+
+inmail:
+  image: allura_web
+  working_dir: /allura/Allura
+  command: paster smtp_server docker-dev.ini
+  volumes_from:
+    - web
+  ports:
+    - "8825:8825"
+  links:
+    - mongo


Mime
View raw message