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

6 years ago · 983c388150
parent 6cfb74e96c 27f13c1ba3
commit 983c388150
2 changed files with 1 additions and 2 deletions
--- a/core/admin/Dockerfile
+++ b/core/admin/Dockerfile
@ -20,7 +20,7 @@ COPY start.py /start.py
 RUN pybabel compile -d mailu/translations

 EXPOSE 80/tcp
-VOLUME ["/data"]
+VOLUME ["/data","/dkim"]
 ENV FLASK_APP mailu

 CMD /start.py
--- a/docs/compose/docker-compose.yml
+++ b/docs/compose/docker-compose.yml
@ -88,7 +88,6 @@ services:
    volumes:
      - "$ROOT/data:/data"
      - "$ROOT/dkim:/dkim"
-      - /var/run/docker.sock:/var/run/docker.sock:ro
    depends_on:
      - redis