Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

2018-07-13 12:04:32 +02:00
parent c372b01909 4b988a2e48
commit 853b924fe1
10 changed files with 415 additions and 460 deletions
--- a/data/Dockerfiles/rspamd/docker-entrypoint.sh
+++ b/data/Dockerfiles/rspamd/docker-entrypoint.sh
@@ -3,4 +3,4 @@
 chown -R _rspamd:_rspamd /var/lib/rspamd
 [[ ! -f /etc/rspamd/override.d/worker-controller-password.inc ]] && echo '# Placeholder' > /etc/rspamd/override.d/worker-controller-password.inc

-exec /sbin/tini -- "$@"
+exec "$@"