Merge branch 'master' into feat-abstract-db

2018-10-10 08:41:56 +02:00
parent fc99eb7b34 5180ce527c
commit 00b5ae11db
28 changed files with 430 additions and 43 deletions
--- a/core/dovecot/Dockerfile
+++ b/core/dovecot/Dockerfile
@@ -3,11 +3,13 @@ FROM alpine:3.8
 RUN apk add --no-cache \
     dovecot dovecot-pigeonhole-plugin dovecot-fts-lucene rspamd-client \
     python3 py3-pip \
- && pip3 install jinja2 podop
+ && pip3 install --upgrade pip \
+ && pip3 install jinja2 podop tenacity

 COPY conf /conf
 COPY start.py /start.py

 EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
+VOLUME ["/data", "/mail"]

 CMD /start.py