@sam, I know you did not like the idea of adding mailcatcher dependency in the Gemfile of the main discourse repo and preferred to manually install it in the dev docker image. However, the fallback installation code from the bin/docker/mailcatcher of the main repo should go away. Would you like me to send a separate PR with just that change?