Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Fix mailcatcher

Browse source
This commit is contained in:
wvengen 2018-11-13 15:06:29 +01:00 committed by wvengen
parent 7050137c68
commit e6e060cab9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/environments/development.rb.SAMPLE
View file

@ -43,7 +43,7 @@ Foodsoft::Application.configure do
# Mailcatcher config, start mailcatcher from console with 'mailcatcher' # Mailcatcher config, start mailcatcher from console with 'mailcatcher'
# Mailcatcher can be installed by gem install mailcatcher # Mailcatcher can be installed by gem install mailcatcher
config.action_mailer.delivery_method = :smtp 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) # Run resque tasks as part of the main app (not recommended for production)
Resque.inline = true unless ENV['REDIS_URL'] Resque.inline = true unless ENV['REDIS_URL']

4
docker-compose-dev.yml
View file

@ -22,9 +22,9 @@ services:
- TEST_DATABASE_URL=mysql2://root:secret@mariadb/test?encoding=utf8 - TEST_DATABASE_URL=mysql2://root:secret@mariadb/test?encoding=utf8
mailcatcher: mailcatcher:
image: aboutsource/mailcatcher image: tophfr/mailcatcher
ports: ports:
- "1080:1080" - "1080:80"
mariadb: mariadb:
image: mariadb:10.1 image: mariadb:10.1