Commit graph

865 commits

Author SHA1 Message Date
Erik Wramner 2424aa41d8
Merge pull request #1305 from erik-wramner/fix_1300_log_permissions
Set expected permissions in log #1300
2019-10-27 10:28:47 +01:00
Erik Wramner 37e0082cd7 Set expected permissions in log #1300 2019-10-27 09:22:16 +01:00
Felix Bartels 7ff9764285
Provide version information through labels (#1256)
* Provide version information through labels

Can be retrieved by calling e.g. `docker inspect -f {{.Config.Labels}} tvial/docker-mailserver:testing`

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* add build hook so that Docker Hub can work with the build args

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* remove obsolete build-no-cache

build args invalidate build cache already

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* adapt travis file

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* shellcheck

Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-10-23 11:22:23 +02:00
Felix Bartels 1029777ffa
Merge pull request #1302 from fbartels/editorconfig
update editorconfig to make code more consistent
2019-10-23 09:49:41 +02:00
Felix Bartels f68eee1bb0 update editorconfig to make code more consistent
Signed-off-by: Felix Bartels <felix@host-consultants.de>
2019-10-23 08:29:16 +02:00
Erik Wramner e2d1c2bf69
Merge pull request #1299 from ap-wtioit/patch-1
Add a hint to run make clean all
2019-10-21 10:22:23 +02:00
Andreas Perhab 59251a5e34
Add a hint to run make clean all
If developers only run make when there is a test failure the clean may not run, so 'make clean all' should be the safe mode to run the tests.
2019-10-18 14:42:00 +02:00
Erik Wramner 3d27cad6f2
Merge pull request #1298 from hack2root/patch-1
Update README.md with new required file for docker-compose.
2019-10-18 08:26:58 +02:00
Artur Mustafin f50cf3ecb4
Update README.md
added command for required file to run docker-compose  up -d mail
2019-10-17 18:53:32 +03:00
Vortex 5e6969e594 Renamed the sample script in config, as it will be called if people make a copy. Better create a sample file with another name that has to be renamed to activate it. 2019-10-17 13:13:20 +02:00
Vortex c30c3bf5de moved user_patches from misc to nearly the end of setups 2019-10-16 18:56:06 +02:00
Erik Wramner 2f1afe4e7c
Merge pull request #1293 from gmasse/fix-test-remove-privacy
[Test] "remove privacy details of the sender" misbehavior
2019-10-16 11:42:21 +02:00
Germain Masse 4049b62bc0 Revert "remove travis notification"
This reverts commit b204f7d14c.
2019-10-16 08:58:20 +00:00
Germain Masse b204f7d14c remove travis notification 2019-10-14 15:30:22 +00:00
Germain Masse b34a79310a Privacy test email no more tagged as SPAM. ClamAV and SA disabled to avoid time-out on low perf system 2019-10-14 13:25:44 +00:00
Erik Wramner 711a3f8e1e
Merge pull request #1287 from martin-schulze-vireso/feature/extract_even_more_tests
Looks good and no WIP in title, I'll merge it.
2019-10-09 08:13:29 +02:00
Martin Schulze e2bbf12524 Tests fx: Also wait for smtp port 2019-10-08 23:39:04 +02:00
Martin Schulze 604a65024e Tests: extract mail_privacy into own .bats file 2019-10-08 23:11:27 +02:00
Martin Schulze 533ac7ed29 Tests: extract mail_pop3 into own .bats file 2019-10-08 22:24:05 +02:00
Martin Schulze 81fd83525c Tests: extract mail_smtponly into own .bats file 2019-10-08 22:15:27 +02:00
Martin Schulze 56f47db0f2 Tests: Extract mail_fail2ban into own .bats file 2019-10-08 22:03:56 +02:00
Daniel Dobko e441f1318a Tests should work from now on
Merge branch 'user-patches.sh'

# Conflicts:
#	config/user-patches.sh
#	target/start-mailserver.sh
2019-10-08 21:55:46 +02:00
Martin Schulze d05255cb04 Tests: Extract mail_fetchmail into own .bats file 2019-10-08 21:45:05 +02:00
Martin Schulze a03c741e1b Extract mail_manual_ssl into own .bats file 2019-10-08 21:36:13 +02:00
Martin Schulze d3e2dfe3ba Move mail_with_ldap into its own .bats file 2019-10-08 21:31:56 +02:00
Undercover1989 275a83667a base files 2019-10-08 21:22:12 +02:00
Undercover1989 0975b71d72 chown docker:docker /tmp/docker-mailserver/user-patches.sh 2019-10-08 19:24:01 +02:00
Undercover1989 b5c422c3c5 start user-patches.sh native instead of explicit using the bash-command 2019-10-08 15:08:01 +02:00
Erik Wramner c56696b25d
Merge pull request #1286 from Undercover1989/changelog
Added section "6.2.0+" to CHANGELOG.md
2019-10-08 13:12:17 +02:00
Undercover1989 b5eea8a747 Added section "6.2.0+" with url to releases 2019-10-07 23:14:43 +02:00
Undercover1989 b01071f52f Added optional file ./config/user-patches.sh which is executed between configuration and starting daemons (misc-section) 2019-10-07 21:04:49 +02:00
Erik Wramner 0e7e586ae3
Merge pull request #1277 from ArashFatahzade/master
Removed a dot from .env-mailserver
2019-09-30 08:33:43 +02:00
Arash Fatahzade 96268bb45b
Removed a dot from .env-mailserver 2019-09-29 21:47:09 +03:30
Erik Wramner 5dca9bd469
Merge pull request #1273 from erik-wramner/issue_1271_take_2
Set REPORT_RECIPIENT to postmaster when 0
2019-09-24 21:37:13 +02:00
Erik Wramner 5f9428fcf3 Set REPORT_RECIPIENT to postmaster when 0 2019-09-24 21:09:48 +02:00
Erik Wramner fe3f747c72
Merge pull request #1272 from erik-wramner/fix_1271_wrong_address
Fix report_recipient bugs
2019-09-22 18:42:11 +02:00
Erik Wramner b9515eae4c Fix report_recipient bugs 2019-09-22 17:16:33 +02:00
Erik Wramner dd710cd7bd
Merge pull request #1270 from mindrunner/master
Separate environments and simplify docker-compose.yml
2019-09-21 08:57:26 +02:00
Lukas Elsner 1fce099ade Separate environments and simplify docker-compose.yml 2019-09-20 13:38:13 -06:00
Lukas Elsner e60e2d180e Separate environments and simplify docker-compose.yml 2019-09-20 10:40:37 -06:00
Erik Wramner dc49f16117
Merge pull request #1262 from erik-wramner/issue_1093_logwatch_pflogsum
Fix #1093, pflogsumm and logwatch.
2019-09-16 09:43:38 +02:00
Erik Wramner 2584124ccd Updated readme after code review 2019-09-16 08:05:18 +02:00
Erik Wramner 008b8e6bce Fix #1093, pflogsumm and logwatch 2019-09-16 08:00:35 +02:00
Erik Wramner 0d1e716f36
Merge pull request #1263 from erik-wramner/issue_1143_override_last
Moved Postfix overrides last to fix #1143
2019-09-15 20:02:33 +02:00
Erik Wramner f14c9fc6ce Moved Postfix overrides last to fix #1143 2019-09-15 18:29:46 +02:00
Erik Wramner 2380634d54
Merge pull request #1260 from martin-schulze-vireso/feature/improve_error_output
Better diagnostics for setup timeout
2019-09-13 08:40:17 +02:00
Martin Schulze d9a48878c9 Print last 10 log lines on container setup timeout 2019-09-12 00:43:44 +02:00
Martin Schulze 3f9dd4180a Fix setup_file marker logic 2019-09-12 00:42:04 +02:00
Martin Schulze a20f2c4199 Add pregenerated test/config dh params 2019-09-12 00:42:04 +02:00
Erik Wramner ca821fa51a
Merge pull request #1259 from martin-schulze-vireso/bugfix/no_error_printed_on_timeout
Fix missing error output from timeout
2019-09-11 14:04:04 +02:00