You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/05/30 14:39:16 UTC
[13/14] allura git commit: [#7806] ticket:778 Add conteiners for
in/out mail
[#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/c57f2e8d
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/c57f2e8d
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/c57f2e8d
Branch: refs/heads/ib/7806
Commit: c57f2e8d46aba5315395a4b0bc2c0678c8c99f0a
Parents: cff0988
Author: Igor Bondarenko <je...@gmail.com>
Authored: Sat May 30 15:00:20 2015 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Sat May 30 15:00:20 2015 +0300
----------------------------------------------------------------------
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/c57f2e8d/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/c57f2e8d/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