From a023ed7a359c7235cee48d18e6a0f206a8c43853 Mon Sep 17 00:00:00 2001 From: Krzysztof Szumny Date: Sun, 10 Apr 2016 23:18:38 +0200 Subject: [PATCH] mailhog-as-docker-container --- {{cookiecutter.repo_name}}/config/settings/local.py | 9 ++++++--- {{cookiecutter.repo_name}}/dev.yml | 7 +++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.repo_name}}/config/settings/local.py b/{{cookiecutter.repo_name}}/config/settings/local.py index b8408c0a..7af3f46c 100644 --- a/{{cookiecutter.repo_name}}/config/settings/local.py +++ b/{{cookiecutter.repo_name}}/config/settings/local.py @@ -23,12 +23,15 @@ SECRET_KEY = env('DJANGO_SECRET_KEY', default='CHANGEME!!!') # Mail settings # ------------------------------------------------------------------------------ -EMAIL_HOST = 'localhost' + EMAIL_PORT = 1025 -{%if cookiecutter.use_mailhog == 'n' -%} +{% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'y' %} +EMAIL_HOST = 'mailhog' +{% else %} +EMAIL_HOST = 'localhost' EMAIL_BACKEND = env('DJANGO_EMAIL_BACKEND', default='django.core.mail.backends.console.EmailBackend') -{%- endif %} +{% endif %} # CACHING # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.repo_name}}/dev.yml b/{{cookiecutter.repo_name}}/dev.yml index 95353a95..490ffc86 100644 --- a/{{cookiecutter.repo_name}}/dev.yml +++ b/{{cookiecutter.repo_name}}/dev.yml @@ -42,3 +42,10 @@ services: links: - postgres {% endif %} + +{% if cookiecutter.use_mailhog == 'y' %} + mailhog: + image: mailhog/mailhog + ports: + - "8025:8025" +{% endif %}