Added tests and simplified some of them

This commit is contained in:
Thomas VIAL 2016-02-03 22:45:11 +01:00
parent 1c3b86dc41
commit 97a495ae1d
3 changed files with 16 additions and 12 deletions

View file

@ -1,7 +1,8 @@
NAME = tvial/docker-mailserver
VERSION = $(TRAVIS_BUILD_ID)
all: build run prepare fixtures tests
all: build run fixtures tests clean
all-no-build: run fixtures tests clean
build:
docker build --no-cache -t $(NAME):$(VERSION) .
@ -13,12 +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)
sleep 25
prepare:
# Reinitialize logs
docker exec mail /bin/sh -c 'echo "" > /var/log/mail.log'
docker exec mail_pop3 /bin/sh -c 'echo "" > /var/log/mail.log'
sleep 60
fixtures:
# Sending test mails
@ -38,3 +34,4 @@ tests:
clean:
# Get default files back
git checkout postfix/accounts.cf postfix/virtual
docker rm -f mail mail_pop3