Merge branch 'master' into 'fix-localpart-chars'

This commit is contained in:
mergify-bot
2018-12-21 14:48:36 +01:00
2 changed files with 1 additions and 2 deletions

View File

@@ -20,7 +20,7 @@ COPY start.py /start.py
RUN pybabel compile -d mailu/translations RUN pybabel compile -d mailu/translations
EXPOSE 80/tcp EXPOSE 80/tcp
VOLUME ["/data"] VOLUME ["/data","/dkim"]
ENV FLASK_APP mailu ENV FLASK_APP mailu
CMD /start.py CMD /start.py

View File

@@ -88,7 +88,6 @@ services:
volumes: volumes:
- "$ROOT/data:/data" - "$ROOT/data:/data"
- "$ROOT/dkim:/dkim" - "$ROOT/dkim:/dkim"
- /var/run/docker.sock:/var/run/docker.sock:ro
depends_on: depends_on:
- redis - redis