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/postfix/Dockerfile
+++ b/core/postfix/Dockerfile
@@ -2,11 +2,13 @@ FROM alpine:3.8

 RUN apk add --no-cache postfix postfix-pcre rsyslog \
    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 25/tcp 10025/tcp
+VOLUME ["/data"]

 CMD /start.py