Fix mailcatcher
This commit is contained in:
parent
7050137c68
commit
e6e060cab9
2 changed files with 3 additions and 3 deletions
|
@ -43,7 +43,7 @@ Foodsoft::Application.configure do
|
|||
# Mailcatcher config, start mailcatcher from console with 'mailcatcher'
|
||||
# Mailcatcher can be installed by gem install mailcatcher
|
||||
config.action_mailer.delivery_method = :smtp
|
||||
config.action_mailer.smtp_settings = { address: ENV.fetch('MAILCATCHER_PORT_1025_TCP_ADDR', 'localhost'), port: ENV.fetch('MAILCATCHER_PORT_1025_TCP_PORT', 1025) }
|
||||
config.action_mailer.smtp_settings = { address: ENV.fetch("MAILCATCHER_PORT_25_TCP_ADDR", "localhost"), port: ENV.fetch("MAILCATCHER_PORT_25_TCP_PORT", 1025) }
|
||||
|
||||
# Run resque tasks as part of the main app (not recommended for production)
|
||||
Resque.inline = true unless ENV['REDIS_URL']
|
||||
|
|
|
@ -22,9 +22,9 @@ services:
|
|||
- TEST_DATABASE_URL=mysql2://root:secret@mariadb/test?encoding=utf8
|
||||
|
||||
mailcatcher:
|
||||
image: aboutsource/mailcatcher
|
||||
image: tophfr/mailcatcher
|
||||
ports:
|
||||
- "1080:1080"
|
||||
- "1080:80"
|
||||
|
||||
mariadb:
|
||||
image: mariadb:10.1
|
||||
|
|
Loading…
Reference in a new issue