diff --git a/Makefile b/Makefile index 1b178117..f96bc3c9 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ run: # Run containers docker run -d --name mail -v "`pwd`/postfix":/tmp/postfix -v "`pwd`/spamassassin":/tmp/spamassassin -v "`pwd`/test":/tmp/test -h mail.my-domain.com -t $(NAME):$(VERSION) docker run -d --name mail_pop3 -v "`pwd`/postfix":/tmp/postfix -v "`pwd`/spamassassin":/tmp/spamassassin -v "`pwd`/test":/tmp/test -e ENABLE_POP3=1 -h mail.my-domain.com -t $(NAME):$(VERSION) + # Wait for containers to fully start sleep 60 fixtures: @@ -34,4 +35,5 @@ tests: clean: # Get default files back git checkout postfix/accounts.cf postfix/virtual + # Remove running test containers docker rm -f mail mail_pop3 \ No newline at end of file diff --git a/README.md b/README.md index 9bdf89ff..114bdafb 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,11 @@ Please read [SSL.md](SSL.md) for more information. Things to do or to improve are stored on [Github](https://github.com/tomav/docker-mailserver/issues), some open by myself. Feel free to improve this docker image. -## Wanna help? +## Contribute -Fork, improve, add tests and PR. ;-) +- Fork +- Improve +- Add integration tests in `test/test.sh` +- Build image and run tests using `make` +- Document your improvements +- Commit, push and make a pull-request