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/Dockerfile
+++ b/data/Dockerfiles/rspamd/Dockerfile
@@ -22,9 +22,7 @@ RUN apt-get update && apt-get install -y \

 COPY settings.conf /etc/rspamd/modules.d/settings.conf
 COPY ratelimit.lua /usr/share/rspamd/lua/ratelimit.lua
-#COPY lua_util.lua /usr/share/rspamd/lib/lua_util.lua
 COPY docker-entrypoint.sh /docker-entrypoint.sh
-COPY tini /sbin/tini

 ENTRYPOINT ["/docker-entrypoint.sh"]