From ea81aebf83167837258b0ee9a0607cd144dfa733 Mon Sep 17 00:00:00 2001
From: Casper <casperklein@users.noreply.github.com>
Date: Mon, 21 Jun 2021 17:36:59 +0200
Subject: [PATCH] Follow-up #2035 (#2047)

* remove volumes section

* bind mounts + localtime
---
 README.md                                 | 24 ++++++++---------------
 docs/content/config/advanced/auth-ldap.md | 12 ++++--------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 7a59af1f..3d1bfda6 100644
--- a/README.md
+++ b/README.md
@@ -197,9 +197,10 @@ services:
       - "587:587"
       - "993:993"
     volumes:
-      - maildata:/var/mail
-      - mailstate:/var/mail-state
-      - maillogs:/var/log/mail
+      - ./data/maildata:/var/mail
+      - ./data/mailstate:/var/mail-state
+      - ./data/maillogs:/var/log/mail
+      - /etc/localtime:/etc/localtime:ro
       - ./config/:/tmp/docker-mailserver/
     environment:
       - ENABLE_SPAMASSASSIN=1
@@ -214,11 +215,6 @@ services:
       - NET_ADMIN
       - SYS_PTRACE
     restart: always
-
-volumes:
-  maildata:
-  mailstate:
-  maillogs:
 ```
 
 #### LDAP setup
@@ -238,9 +234,10 @@ services:
       - "587:587"
       - "993:993"
     volumes:
-      - maildata:/var/mail
-      - mailstate:/var/mail-state
-      - maillogs:/var/log/mail
+      - ./data/maildata:/var/mail
+      - ./data/mailstate:/var/mail-state
+      - ./data/maillogs:/var/log/mail
+      - /etc/localtime:/etc/localtime:ro
       - ./config/:/tmp/docker-mailserver/
     environment:
       - ENABLE_SPAMASSASSIN=1
@@ -274,9 +271,4 @@ services:
       - NET_ADMIN
       - SYS_PTRACE
     restart: always
-
-volumes:
-  maildata:
-  mailstate:
-  maillogs:
 ```
diff --git a/docs/content/config/advanced/auth-ldap.md b/docs/content/config/advanced/auth-ldap.md
index f33e0e98..930a8ea1 100644
--- a/docs/content/config/advanced/auth-ldap.md
+++ b/docs/content/config/advanced/auth-ldap.md
@@ -141,8 +141,10 @@ To enable LDAP over StartTLS (on port 389), you need to set the following enviro
           - "993:993"
 
         volumes:
-          - maildata:/var/mail
-          - mailstate:/var/mail-state
+          - ./data/maildata:/var/mail
+          - ./data/mailstate:/var/mail-state
+          - ./data/maillogs:/var/log/mail
+          - /etc/localtime:/etc/localtime:ro
           - ./config/:/tmp/docker-mailserver/
 
         environment:
@@ -184,12 +186,6 @@ To enable LDAP over StartTLS (on port 389), you need to set the following enviro
 
         cap_add:
           - NET_ADMIN
-
-    volumes:
-      maildata:
-        driver: local
-      mailstate:
-        driver: local
     ```
 
 ??? example "Kopano / Zarafa"