github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

Moved test files and mounted read-only

Browse source
This commit is contained in:
Erik Wramner 2019-07-30 13:16:23 +02:00
parent 566c28555a
commit f849b46462
43 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Makefile
View file

@ -29,7 +29,7 @@ run:
# Run containers
docker run -d --name mail \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-v "`pwd`/test/onedir":/var/mail-state \
-e ENABLE_CLAMAV=1 \
-e SPOOF_PROTECTION=1 \
@ -51,7 +51,7 @@ run:
sleep 15
docker run -d --name mail_privacy \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e ENABLE_CLAMAV=1 \
-e ENABLE_SPAMASSASSIN=1 \
-e SA_TAG=-5.0 \
@ -68,7 +68,7 @@ run:
sleep 15
docker run -d --name mail_pop3 \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-v "`pwd`/test/config/letsencrypt":/etc/letsencrypt/live \
-e ENABLE_POP3=1 \
-e DMS_DEBUG=0 \
@ -77,7 +77,7 @@ run:
sleep 15
docker run -d --name mail_smtponly \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e SMTP_ONLY=1 \
-e PERMIT_DOCKER=network \
-e DMS_DEBUG=0 \
@ -93,7 +93,7 @@ run:
sleep 15
docker run -d --name mail_override_hostname \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e PERMIT_DOCKER=network \
-e DMS_DEBUG=0 \
-e ENABLE_SRS=1 \
@ -103,7 +103,7 @@ run:
sleep 15
docker run -d --name mail_domainname \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e PERMIT_DOCKER=network \
-e DMS_DEBUG=0 \
-e ENABLE_SRS=1 \
@ -113,7 +113,7 @@ run:
sleep 15
docker run -d --name mail_srs_domainname \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e PERMIT_DOCKER=network \
-e DMS_DEBUG=0 \
-e ENABLE_SRS=1 \
@ -124,7 +124,7 @@ run:
sleep 15
docker run -d --name mail_fail2ban \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e ENABLE_FAIL2BAN=1 \
-e POSTSCREEN_ACTION=ignore \
--cap-add=NET_ADMIN \
@ -132,7 +132,7 @@ run:
sleep 15
docker run -d --name mail_fetchmail \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e ENABLE_FETCHMAIL=1 \
--cap-add=NET_ADMIN \
-e DMS_DEBUG=0 \
@ -140,7 +140,7 @@ run:
sleep 15
docker run -d --name mail_disabled_clamav_spamassassin \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e ENABLE_CLAMAV=0 \
-e ENABLE_SPAMASSASSIN=0 \
-e DMS_DEBUG=0 \
@ -148,7 +148,7 @@ run:
sleep 15
docker run -d --name mail_manual_ssl \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e SSL_TYPE=manual \
-e SSL_CERT_PATH=/tmp/docker-mailserver/letsencrypt/mail.my-domain.com/fullchain.pem \
-e SSL_KEY_PATH=/tmp/docker-mailserver/letsencrypt/mail.my-domain.com/privkey.pem \
@ -161,7 +161,7 @@ run:
sleep 15
docker run -d --name mail_with_ldap \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e ENABLE_LDAP=1 \
-e LDAP_SERVER_HOST=ldap \
-e LDAP_START_TLS=no \
@ -190,7 +190,7 @@ run:
sleep 15
docker run -d --name mail_with_imap \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e ENABLE_SASLAUTHD=1 \
-e SASLAUTHD_MECHANISMS=rimap \
-e SASLAUTHD_MECH_OPTIONS=127.0.0.1 \
@ -200,7 +200,7 @@ run:
sleep 15
docker run -d --name mail_postscreen \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e POSTSCREEN_ACTION=enforce \
--cap-add=NET_ADMIN \
-h mail.my-domain.com -t $(NAME)
@ -208,7 +208,7 @@ run:
docker run -d --name mail_lmtp_ip \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test/config/dovecot-lmtp":/etc/dovecot \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e ENABLE_POSTFIX_VIRTUAL_TRANSPORT=1 \
-e POSTFIX_DAGENT=lmtp:127.0.0.1:24 \
-e DMS_DEBUG=0 \
@ -216,7 +216,7 @@ run:
sleep 30
docker run -d --name mail_with_postgrey \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e ENABLE_POSTGREY=1 \
-e POSTGREY_DELAY=15 \
-e POSTGREY_MAX_AGE=35 \
@ -227,14 +227,14 @@ run:
sleep 20
docker run -d --name mail_undef_spam_subject \
-v "`pwd`/test/config":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e ENABLE_SPAMASSASSIN=1 \
-e SA_SPAM_SUBJECT="undef" \
-h mail.my-domain.com -t $(NAME)
sleep 15
docker run -d --name mail_with_relays \
-v "`pwd`/test/config/relay-hosts":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e RELAY_HOST=default.relay.com \
-e RELAY_PORT=2525 \
-e RELAY_USER=smtp_user \
@ -246,7 +246,7 @@ run:
sleep 15
docker run -d --name mail_with_default_relay \
-v "`pwd`/test/config/relay-hosts":/tmp/docker-mailserver \
-v "`pwd`/test":/tmp/docker-mailserver-test \
-v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \
-e DEFAULT_RELAY_HOST=default.relay.host.invalid:25 \
--cap-add=SYS_PTRACE \
-e PERMIT_DOCKER=host \
@ -329,4 +329,4 @@ clean:
sudo rm -rf test/config ;\
mv testconfig.bak test/config ;\
fi
-sudo rm -rf test/onedir test/alias test/relay test/config/dovecot-lmtp/userdb test/config/key* test/config/opendkim/keys/domain.tld/ test/config/opendkim/keys/example.com/ test/config/opendkim/keys/localdomain2.com/ test/config/postfix-aliases.cf test/config/postfix-receive-access.cf test/config/postfix-receive-access.cfe test/config/postfix-send-access.cf test/config/postfix-send-access.cfe test/config/relay-hosts/chksum test/config/relay-hosts/postfix-aliases.cf
-sudo rm -rf test/onedir test/alias test/relay test/config/dovecot-lmtp/userdb test/config/key* test/config/opendkim/keys/domain.tld/ test/config/opendkim/keys/example.com/ test/config/opendkim/keys/localdomain2.com/ test/config/postfix-aliases.cf test/config/postfix-receive-access.cf test/config/postfix-receive-access.cfe test/config/postfix-send-access.cf test/config/postfix-send-access.cfe test/config/relay-hosts/chksum test/config/relay-hosts/postfix-aliases.cf

0
test/auth/added-imap-auth.txt → test/test-files/auth/added-imap-auth.txt
View file

0
test/auth/added-pop3-auth.txt → test/test-files/auth/added-pop3-auth.txt
View file

0
test/auth/added-smtp-auth-login-wrong.txt → test/test-files/auth/added-smtp-auth-login-wrong.txt
View file

0
test/auth/added-smtp-auth-login.txt → test/test-files/auth/added-smtp-auth-login.txt
View file

0
test/auth/added-smtp-auth-plain-wrong.txt → test/test-files/auth/added-smtp-auth-plain-wrong.txt
View file

0
test/auth/added-smtp-auth-plain.txt → test/test-files/auth/added-smtp-auth-plain.txt
View file

0
test/auth/added-smtp-auth-spoofed-alias.txt → test/test-files/auth/added-smtp-auth-spoofed-alias.txt
View file

0
test/auth/added-smtp-auth-spoofed.txt → test/test-files/auth/added-smtp-auth-spoofed.txt
View file

0
test/auth/imap-auth.txt → test/test-files/auth/imap-auth.txt
View file

0
test/auth/imap-ldap-auth.txt → test/test-files/auth/imap-ldap-auth.txt
View file

0
test/auth/ldap-smtp-auth-spoofed-alias.txt → test/test-files/auth/ldap-smtp-auth-spoofed-alias.txt
View file

0
test/auth/ldap-smtp-auth-spoofed.txt → test/test-files/auth/ldap-smtp-auth-spoofed.txt
View file

0
test/auth/pop3-auth.txt → test/test-files/auth/pop3-auth.txt
View file

0
test/auth/sasl-ldap-smtp-auth.txt → test/test-files/auth/sasl-ldap-smtp-auth.txt
View file

0
test/auth/smtp-auth-login-wrong.txt → test/test-files/auth/smtp-auth-login-wrong.txt
View file

0
test/auth/smtp-auth-login.txt → test/test-files/auth/smtp-auth-login.txt
View file

0
test/auth/smtp-auth-plain-wrong.txt → test/test-files/auth/smtp-auth-plain-wrong.txt
View file

0
test/auth/smtp-auth-plain.txt → test/test-files/auth/smtp-auth-plain.txt
View file

0
test/email-templates/amavis-spam.txt → test/test-files/email-templates/amavis-spam.txt
View file

0
test/email-templates/amavis-virus.txt → test/test-files/email-templates/amavis-virus.txt
View file

0
test/email-templates/existing-added.txt → test/test-files/email-templates/existing-added.txt
View file

0
test/email-templates/existing-alias-external.txt → test/test-files/email-templates/existing-alias-external.txt
View file

0
test/email-templates/existing-alias-local.txt → test/test-files/email-templates/existing-alias-local.txt
View file

0
test/email-templates/existing-alias-recipient-delimiter.txt → test/test-files/email-templates/existing-alias-recipient-delimiter.txt
View file

0
test/email-templates/existing-catchall-local.txt → test/test-files/email-templates/existing-catchall-local.txt
View file

0
test/email-templates/existing-regexp-alias-external.txt → test/test-files/email-templates/existing-regexp-alias-external.txt
View file

0
test/email-templates/existing-regexp-alias-local.txt → test/test-files/email-templates/existing-regexp-alias-local.txt
View file

0
test/email-templates/existing-user-and-cc-local-alias.txt → test/test-files/email-templates/existing-user-and-cc-local-alias.txt
View file

0
test/email-templates/existing-user1.txt → test/test-files/email-templates/existing-user1.txt
View file

0
test/email-templates/existing-user2.txt → test/test-files/email-templates/existing-user2.txt
View file

0
test/email-templates/non-existing-user.txt → test/test-files/email-templates/non-existing-user.txt
View file

0
test/email-templates/postgrey.txt → test/test-files/email-templates/postgrey.txt
View file

0
test/email-templates/root-email.txt → test/test-files/email-templates/root-email.txt
View file

0
test/email-templates/send-privacy-email.txt → test/test-files/email-templates/send-privacy-email.txt
View file

0
test/email-templates/sieve-pipe.txt → test/test-files/email-templates/sieve-pipe.txt
View file

0
test/email-templates/sieve-spam-folder.txt → test/test-files/email-templates/sieve-spam-folder.txt
View file

0
test/email-templates/smtp-only.txt → test/test-files/email-templates/smtp-only.txt
View file

0
test/email-templates/test-email.txt → test/test-files/email-templates/test-email.txt
View file

0
test/nc_templates/postgrey_whitelist.txt → test/test-files/nc_templates/postgrey_whitelist.txt
View file

0
test/nc_templates/postgrey_whitelist_local.txt → test/test-files/nc_templates/postgrey_whitelist_local.txt
View file

0
test/nc_templates/postgrey_whitelist_recipients.txt → test/test-files/nc_templates/postgrey_whitelist_recipients.txt
View file

5
test/tests.bats
View file

@ -880,7 +880,10 @@ load 'test_helper/bats-assert/load'
MAIL_FAIL2BAN_IP=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' mail_fail2ban)
# Create a container which will send wrong authentications and should get banned
docker run --name fail-auth-mailer -e MAIL_FAIL2BAN_IP=$MAIL_FAIL2BAN_IP -v "$(pwd)/test":/tmp/docker-mailserver-test -d $(docker inspect --format '{{ .Config.Image }}' mail) tail -f /var/log/faillog
docker run --name fail-auth-mailer -e MAIL_FAIL2BAN_IP=$MAIL_FAIL2BAN_IP \
-v "$(pwd)/test/test-files":/tmp/docker-mailserver-test \
-d $(docker inspect --format '{{ .Config.Image }}' mail) \
tail -f /var/log/faillog
# can't pipe the file as usual due to postscreen. (respecting postscreen_greet_wait time and talking in turn):
for i in {1,2}; do