docs: Update all docker-compose files to use the same version and examples (#2159)

Initial pass for achieving more consistency with docker-compose related configs.

* Set DMS_DEBUG to 0
* align with default docker-compose.yml

Co-authored-by: Casper <casperklein@users.noreply.github.com>
Co-authored-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
Co-authored-by: Brennan Kinney <5098581+polarathene@users.noreply.github.com>

docker-compose.yml

@@ -3,8 +3,8 @@ version: '3.8'
 services:
   mailserver:
     image: docker.io/mailserver/docker-mailserver:latest
-    hostname: <HOSTNAME> # <-- CHANGE THIS
+    hostname: mail
-    domainname: <DOMAINNAME> # <-- CHANGE THIS
+    domainname: example.com
     container_name: mailserver
     env_file: mailserver.env
     # To avoid conflicts with yaml base-60 float, DO NOT remove the quotation marks.
@@ -24,4 +24,7 @@ services:
       - ./config/:/tmp/docker-mailserver/
     restart: always
     stop_grace_period: 1m
-    cap_add: [ "NET_ADMIN", "SYS_PTRACE" ]
+    cap_add:
+      - NET_ADMIN
+      - SYS_PTRACE
+

docs/content/config/advanced/auth-ldap.md

@@ -126,13 +126,13 @@ To enable LDAP over StartTLS (on port 389), you need to set the following enviro
 ???+ example "Basic Setup"
 
     ```yaml
-    version: '2'
+    version: '3.8'
     services:
-      mail:
+      mailserver:
-        image: mailserver/docker-mailserver:latest
+        image: docker.io/mailserver/docker-mailserver:latest
         hostname: mail
-        domainname: example.org
+        domainname: example.com
-        container_name: mail
+        container_name: mailserver
 
         ports:
           - "25:25"
@@ -191,14 +191,14 @@ To enable LDAP over StartTLS (on port 389), you need to set the following enviro
 ??? example "Kopano / Zarafa"
 
     ```yaml
-    version: '2'
+    version: '3.8'
 
     services:
-      mail:
+      mailserver:
-        image: mailserver/docker-mailserver:latest
+        image: docker.io/mailserver/docker-mailserver:latest
         hostname: mail
-        domainname: domain.com
+        domainname: example.com
-        container_name: mail
+        container_name: mailserver
 
         ports:
           - "25:25"

docs/content/config/advanced/full-text-search.md

@@ -62,7 +62,7 @@ While indexing is memory intensive, you can configure the plugin to limit the am
       version: '3.8'
       services:
         mailserver:
-          image: mailserver/docker-mailserver:latest
+          image: docker.io/mailserver/docker-mailserver:latest
           hostname: mail
           domainname: example.com
           container_name: mailserver
@@ -82,7 +82,9 @@ While indexing is memory intensive, you can configure the plugin to limit the am
             - ./fts-xapian-plugin.conf:/etc/dovecot/conf.d/10-plugin.conf:ro
           restart: always
           stop_grace_period: 1m
-          cap_add: [ "NET_ADMIN", "SYS_PTRACE" ]
+          cap_add:
+            - NET_ADMIN
+            - SYS_PTRACE
     ```
 
   3. Recreate containers: 
@@ -126,7 +128,7 @@ However, Solr also requires a fair bit of RAM. While Solr is [highly tuneable](h
       mailserver:
         depends_on:
           - solr
-        image: mailserver/docker-mailserver:latest
+        image: docker.io/mailserver/docker-mailserver:latest
         ...
         volumes:
           ...

docs/content/config/advanced/kubernetes.md

@@ -176,7 +176,7 @@ spec:
       hostname: mailserver
       containers:
         - name: mailserver
-          image: ghcr.io/docker-mailserver/docker-mailserver:10.0.0
+          image: ghcr.io/docker-mailserver/docker-mailserver:latest
           imagePullPolicy: IfNotPresent
 
           securityContext:

docs/content/config/advanced/override-defaults/dovecot.md

@@ -36,7 +36,7 @@ You will need to first obtain the configuration from the running container: `mkd
 
 ```yaml
 services:
-  mail:
+  mailserver:
     volumes:
       - maildata:/var/mail
       - ./config/dovecot/10-master.conf:/etc/dovecot/conf.d/10-master.conf

docs/content/config/security/ssl.md

@@ -191,12 +191,12 @@ The second part of the setup is the actual mail container. So, in another folder
 ???+ example "Example Code"
 
     ```yaml
-    version: '2'
+    version: '3.8'
     services:
       mailserver:
-        image: mailserver/docker-mailserver:latest
+        image: docker.io/mailserver/docker-mailserver:latest
-        hostname: <HOSTNAME> # <-- change this
+        hostname: mail
-        domainname: <DOMAINNAME> # <-- change this
+        domainname: example.com
         container_name: mailserver
         ports:
           - "25:25"
@@ -380,14 +380,12 @@ This setup only comes with one caveat: The domain has to be configured on anothe
 
     ``` YAML
     version: '3.8'
-
     services:
-
       mailserver:
         image: docker.io/mailserver/docker-mailserver:latest
-        container_name: mailserver
         hostname: mail
-        domainname: domain.tld
+        domainname: example.com
+        container_name: mailserver
         volumes:
            - /traefik/acme.json:/etc/letsencrypt/acme.json:ro
         environment:
@@ -397,7 +395,7 @@ This setup only comes with one caveat: The domain has to be configured on anothe
           # SSL_DOMAIN: example.com
 
       traefik:
-        image: docker.io/traefik:v2.4.8
+        image: docker.io/traefik:v2.5
         ports:
            - "80:80"
            - "443:443"

docs/content/config/setup.sh.md

@@ -44,7 +44,7 @@ DESCRIPTION
     see the tagging convention in the README under
     https://github.com/docker-mailserver/docker-mailserver/blob/master/README.md
 
-    You will be able to see detailed information about the script you are invoking and
+    You will be able to see detailed information about the script you're invoking and
     its arguments by appending help after your command. Currently, this
     does not work with all scripts.
 

docs/content/examples/tutorials/basic-installation.md

@@ -25,28 +25,30 @@ We are going to use this docker based mailserver:
     !!! example
 
         ```yaml
-        version: '2'
+        version: '3.8'
 
         services:
-        mail:
+          mailserver:
-            image: mailserver/docker-mailserver:latest
+            image: docker.io/mailserver/docker-mailserver:latest
             hostname: mail
-            domainname: example.org
+            domainname: example.com
-            container_name: mail
+            container_name: mailserver
             ports:
                 - "25:25"
                 - "587:587"
                 - "465:465"
             volumes:
-            - ./data/:/var/mail/
+                - ./data/maildata:/var/mail
-            - ./state/:/var/mail-state/
+                - ./data/mailstate:/var/mail-state
+                - ./data/maillogs:/var/log/mail
+                - /etc/localtime:/etc/localtime:ro
                 - ./config/:/tmp/docker-mailserver/
                 - /var/ds/wsproxy/letsencrypt/:/etc/letsencrypt/
             environment:
                 - PERMIT_DOCKER=network
                 - SSL_TYPE=letsencrypt
                 - ONE_DIR=1
-            - DMS_DEBUG=1
+                - DMS_DEBUG=0
                 - SPOOF_PROTECTION=0
                 - REPORT_RECIPIENT=1
                 - ENABLE_SPAMASSASSIN=0

docs/content/examples/tutorials/mailserver-behind-proxy.md

@@ -54,13 +54,16 @@ Feel free to add your configuration if you archived the same goal using differen
     [...]
     ```
 
-    Truncated list of neccessary labels on the mailserver container:
+    Truncated list of necessary labels on the mailserver container:
 
     ```yaml
-    version: '2'
+    version: '3.8'
     services:
-      mail:
+      mailserver:
-        image: mailserver/docker-mailserver:latest
+        image: docker.io/mailserver/docker-mailserver:latest
+        hostname: mail
+        domainname: example.com
+        container_name: mailserver
         restart: always
         networks:
           - proxy

docs/content/faq.md

@@ -209,8 +209,8 @@ The following configuration works nicely:
 
     ```yaml
     services:
-      mail:
+      mailserver:
-        image: mailserver/docker-mailserver:latest
+        image: docker.io/mailserver/docker-mailserver:latest
         volumes:
           - ./cron/sa-learn:/etc/cron.d/sa-learn
     ```
@@ -221,8 +221,8 @@ The following configuration works nicely:
     version: "3.3"
 
     services:
-      mail:
+      mailserver:
-        image: mailserver/docker-mailserver:latest
+        image: docker.io/mailserver/docker-mailserver:latest
         # ...
         configs:
           - source: my_sa_crontab