Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MailDev container and prefer it over mailcatcher #304

Merged
merged 1 commit into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Although this project started as a development environment for Totara Learn it c
* Microsoft SQL Server ([2017](https://www.microsoft.com/en-us/sql-server/sql-server-2017), [2019](https://www.microsoft.com/en-us/sql-server/sql-server-2019), [2022](https://www.microsoft.com/en-us/sql-server/sql-server-2022))
* [NodeJS](https://nodejs.org/) for building, developing and testing frontend code
* A [PHPUnit](https://phpunit.de/) and [Behat](http://behat.org/en/latest/) setup to run tests (including [Selenium](https://www.seleniumhq.org/))
* A [mailcatcher](https://mailcatcher.me/) instance to view sent emails
* A [MailDev](https://github.com/maildev/maildev?tab=readme-ov-file#maildev) instance to view sent emails
* [Redis](https://redis.io/) for caching and/or session handling
* [XHProf](https://github.com/tideways/php-xhprof-extension) for profiling
* [XDebug](https://xdebug.org/) installed, ready for debugging with your favorite IDE
Expand Down
2 changes: 1 addition & 1 deletion compose/apache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
- ${LOCAL_SRC}:${REMOTE_SRC}
- totara-data:${REMOTE_DATA}
depends_on:
- mailcatcher
- maildev
networks:
totara:
aliases:
Expand Down
2 changes: 1 addition & 1 deletion compose/nginx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
- ${LOCAL_SRC}:${REMOTE_SRC}
- totara-data:${REMOTE_DATA}
depends_on:
- mailcatcher
- maildev
networks:
totara:
aliases:
Expand Down
2 changes: 1 addition & 1 deletion config.php
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@
//////////////////////////////////////////////////////////////////////////

// Redirects any emails sent by the server
$CFG->smtphosts = 'mailcatcher:25';
$CFG->smtphosts = 'maildev:1025';

$CFG->passwordpolicy = false;
$CFG->tool_generator_users_password = '12345';
Expand Down
11 changes: 11 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ services:
- totara-data:${REMOTE_DATA}
working_dir: ${REMOTE_SRC}

maildev:
image: maildev/maildev
container_name: totara_maildev
ports:
- "1080:1080"
environment:
TZ: ${TIME_ZONE}
networks:
- totara

# Deprecated - use maildev instead
mailcatcher:
image: tophfr/mailcatcher
container_name: totara_mailcatcher
Expand Down
Loading