deploy: 4d3fade23b9f5da04ccb2b5d0a454174d8792d1e

edge/config/advanced/auth-ldap/index.html

@@ -1524,13 +1524,13 @@
 <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">SASLAUTHD_LDAP_START_TLS=yes</span>
 </code></pre></div>
 <h2 id="ldap-setup-examples"><a class="toclink" href="#ldap-setup-examples">LDAP Setup Examples</a></h2>
-<details class="example" open="open"><summary>Basic Setup</summary><div class="highlight"><pre><span></span><code><span class="nt">version</span><span class="p">:</span> <span class="s">&#39;2&#39;</span>
+<details class="example" open="open"><summary>Basic Setup</summary><div class="highlight"><pre><span></span><code><span class="nt">version</span><span class="p">:</span> <span class="s">&#39;3.8&#39;</span>
 <span class="nt">services</span><span class="p">:</span>
-  <span class="nt">mail</span><span class="p">:</span>
+  <span class="nt">mailserver</span><span class="p">:</span>
-    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver/docker-mailserver:latest</span>
+    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">docker.io/mailserver/docker-mailserver:latest</span>
     <span class="nt">hostname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mail</span>
-    <span class="nt">domainname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">example.org</span>
+    <span class="nt">domainname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">example.com</span>
-    <span class="nt">container_name</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mail</span>
+    <span class="nt">container_name</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver</span>
 
     <span class="nt">ports</span><span class="p">:</span>
       <span class="p p-Indicator">-</span> <span class="s">&quot;25:25&quot;</span>
@@ -1586,14 +1586,14 @@
       <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">NET_ADMIN</span>
 </code></pre></div>
 </details>
-<details class="example"><summary>Kopano / Zarafa</summary><div class="highlight"><pre><span></span><code><span class="nt">version</span><span class="p">:</span> <span class="s">&#39;2&#39;</span>
+<details class="example"><summary>Kopano / Zarafa</summary><div class="highlight"><pre><span></span><code><span class="nt">version</span><span class="p">:</span> <span class="s">&#39;3.8&#39;</span>
 
 <span class="nt">services</span><span class="p">:</span>
-  <span class="nt">mail</span><span class="p">:</span>
+  <span class="nt">mailserver</span><span class="p">:</span>
-    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver/docker-mailserver:latest</span>
+    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">docker.io/mailserver/docker-mailserver:latest</span>
     <span class="nt">hostname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mail</span>
-    <span class="nt">domainname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">domain.com</span>
+    <span class="nt">domainname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">example.com</span>
-    <span class="nt">container_name</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mail</span>
+    <span class="nt">container_name</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver</span>
 
     <span class="nt">ports</span><span class="p">:</span>
       <span class="p p-Indicator">-</span> <span class="s">&quot;25:25&quot;</span>

edge/config/advanced/full-text-search/index.html

@@ -1475,7 +1475,7 @@ service indexer-worker {
 <div class="highlight"><pre><span></span><code>  <span class="nt">version</span><span class="p">:</span> <span class="s">&#39;3.8&#39;</span>
   <span class="nt">services</span><span class="p">:</span>
     <span class="nt">mailserver</span><span class="p">:</span>
-      <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver/docker-mailserver:latest</span>
+      <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">docker.io/mailserver/docker-mailserver:latest</span>
       <span class="nt">hostname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mail</span>
       <span class="nt">domainname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">example.com</span>
       <span class="nt">container_name</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver</span>
@@ -1495,7 +1495,9 @@ service indexer-worker {
         <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">./fts-xapian-plugin.conf:/etc/dovecot/conf.d/10-plugin.conf:ro</span>
       <span class="nt">restart</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">always</span>
       <span class="nt">stop_grace_period</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">1m</span>
-      <span class="nt">cap_add</span><span class="p">:</span> <span class="p p-Indicator">[</span> <span class="s">&quot;NET_ADMIN&quot;</span><span class="p p-Indicator">,</span> <span class="s">&quot;SYS_PTRACE&quot;</span> <span class="p p-Indicator">]</span>
+      <span class="nt">cap_add</span><span class="p">:</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">NET_ADMIN</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">SYS_PTRACE</span>
 </code></pre></div>
 </li>
 <li>
@@ -1532,7 +1534,7 @@ service indexer-worker {
   <span class="nt">mailserver</span><span class="p">:</span>
     <span class="nt">depends_on</span><span class="p">:</span>
       <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">solr</span>
-    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver/docker-mailserver:latest</span>
+    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">docker.io/mailserver/docker-mailserver:latest</span>
     <span class="l l-Scalar l-Scalar-Plain">...</span>
     <span class="nt">volumes</span><span class="p">:</span>
       <span class="l l-Scalar l-Scalar-Plain">...</span>
@@ -1551,7 +1553,7 @@ service indexer-worker {
 <span class="na">plugin {</span>
   <span class="na">fts</span> <span class="o">=</span> <span class="s">solr</span>
   <span class="na">fts_autoindex</span> <span class="o">=</span> <span class="s">yes</span>
-  <span class="na">fts_solr</span> <span class="o">=</span> <span class="s">url=http://solr:8983/solr/dovecot/ </span>
+  <span class="na">fts_solr</span> <span class="o">=</span> <span class="s">url=http://solr:8983/solr/dovecot/</span>
 <span class="na">}</span>
 </code></pre></div>
 </li>

edge/config/advanced/kubernetes/index.html

@@ -1687,7 +1687,7 @@
       <span class="nt">hostname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver</span>
       <span class="nt">containers</span><span class="p">:</span>
         <span class="p p-Indicator">-</span> <span class="nt">name</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver</span>
-          <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">ghcr.io/docker-mailserver/docker-mailserver:10.0.0</span>
+          <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">ghcr.io/docker-mailserver/docker-mailserver:latest</span>
           <span class="nt">imagePullPolicy</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">IfNotPresent</span>
 
           <span class="nt">securityContext</span><span class="p">:</span>

edge/config/advanced/override-defaults/dovecot/index.html

@@ -1371,7 +1371,7 @@
 <p>For major configuration changes it’s best to override the dovecot configuration files. For each configuration file you want to override, add a list entry under the <code>volumes</code> key.</p>
 <p>You will need to first obtain the configuration from the running container: <code>mkdir -p ./config/dovecot &amp;&amp; docker cp mailserver:/etc/dovecot/conf.d/10-master.conf ./config/dovecot/10-master.conf</code></p>
 <div class="highlight"><pre><span></span><code><span class="nt">services</span><span class="p">:</span>
-  <span class="nt">mail</span><span class="p">:</span>
+  <span class="nt">mailserver</span><span class="p">:</span>
     <span class="nt">volumes</span><span class="p">:</span>
       <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">maildata:/var/mail</span>
       <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">./config/dovecot/10-master.conf:/etc/dovecot/conf.d/10-master.conf</span>

edge/config/security/ssl/index.html

@@ -1637,7 +1637,7 @@
 <details class="example" open="open"><summary>Example Code</summary><div class="highlight"><pre><span></span><code><span class="nt">version</span><span class="p">:</span> <span class="s">&quot;2&quot;</span>
 
 <span class="nt">services</span><span class="p">:</span>
-  <span class="nt">nginx</span><span class="p">:</span> 
+  <span class="nt">nginx</span><span class="p">:</span>
     <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">nginx</span>
     <span class="nt">container_name</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">nginx</span>
     <span class="nt">ports</span><span class="p">:</span>
@@ -1684,12 +1684,12 @@
 </code></pre></div>
 </details>
 <p>The second part of the setup is the actual mail container. So, in another folder, create another <code>docker-compose.yml</code> with the following content (Removed all ENV variables for this example):</p>
-<details class="example" open="open"><summary>Example Code</summary><div class="highlight"><pre><span></span><code><span class="nt">version</span><span class="p">:</span> <span class="s">&#39;2&#39;</span>
+<details class="example" open="open"><summary>Example Code</summary><div class="highlight"><pre><span></span><code><span class="nt">version</span><span class="p">:</span> <span class="s">&#39;3.8&#39;</span>
 <span class="nt">services</span><span class="p">:</span>
   <span class="nt">mailserver</span><span class="p">:</span>
-    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver/docker-mailserver:latest</span>
+    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">docker.io/mailserver/docker-mailserver:latest</span>
-    <span class="nt">hostname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">&lt;HOSTNAME&gt;</span> <span class="c1"># &lt;-- change this</span>
+    <span class="nt">hostname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mail</span>
-    <span class="nt">domainname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">&lt;DOMAINNAME&gt;</span> <span class="c1"># &lt;-- change this</span>
+    <span class="nt">domainname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">example.com</span>
     <span class="nt">container_name</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver</span>
     <span class="nt">ports</span><span class="p">:</span>
       <span class="p p-Indicator">-</span> <span class="s">&quot;25:25&quot;</span>
@@ -1842,14 +1842,12 @@
 <p>This setup only comes with one caveat: The domain has to be configured on another service for <a href="https://github.com/containous/traefik">Traefik</a> to actually request it from Let'sEncrypt, i.e. <a href="https://github.com/containous/traefik">Traefik</a> will not issue a certificate without a service / router demanding it.</p>
 <details class="example" open="open"><summary>Example Code</summary><p>Here is an example setup for <a href="https://docs.docker.com/compose/"><code>docker-compose</code></a>:</p>
 <div class="highlight"><pre><span></span><code><span class="nt">version</span><span class="p">:</span> <span class="s">&#39;3.8&#39;</span>
-
 <span class="nt">services</span><span class="p">:</span>
-
   <span class="nt">mailserver</span><span class="p">:</span>
     <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">docker.io/mailserver/docker-mailserver:latest</span>
-    <span class="nt">container_name</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver</span>
     <span class="nt">hostname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mail</span>
-    <span class="nt">domainname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">domain.tld</span>
+    <span class="nt">domainname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">example.com</span>
+    <span class="nt">container_name</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver</span>
     <span class="nt">volumes</span><span class="p">:</span>
        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">/traefik/acme.json:/etc/letsencrypt/acme.json:ro</span>
     <span class="nt">environment</span><span class="p">:</span>
@@ -1859,7 +1857,7 @@
       <span class="c1"># SSL_DOMAIN: example.com</span>
 
   <span class="nt">traefik</span><span class="p">:</span>
-    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">docker.io/traefik:v2.4.8</span>
+    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">docker.io/traefik:v2.5</span>
     <span class="nt">ports</span><span class="p">:</span>
        <span class="p p-Indicator">-</span> <span class="s">&quot;80:80&quot;</span>
        <span class="p p-Indicator">-</span> <span class="s">&quot;443:443&quot;</span>
@@ -1878,7 +1876,7 @@
        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">/var/run/docker.sock:/var/run/docker.sock:ro</span>
 
   <span class="nt">whoami</span><span class="p">:</span>
-    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">docker.io/traefik/whoami:latest</span> 
+    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">docker.io/traefik/whoami:latest</span>
     <span class="nt">labels</span><span class="p">:</span>
        <span class="p p-Indicator">-</span> <span class="s">&quot;traefik.http.routers.whoami.rule=Host(`mail.domain.tld`)&quot;</span>
 </code></pre></div>

edge/config/setup.sh/index.html

@@ -1355,7 +1355,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.
 

edge/examples/tutorials/basic-installation/index.html

@@ -1342,37 +1342,39 @@ chmod a+x ./setup.sh
 <p>Create the file <code>docker-compose.yml</code> with a content like this:</p>
 <div class="admonition example">
 <p class="admonition-title">Example</p>
-<div class="highlight"><pre><span></span><code><span class="nt">version</span><span class="p">:</span> <span class="s">&#39;2&#39;</span>
+<div class="highlight"><pre><span></span><code><span class="nt">version</span><span class="p">:</span> <span class="s">&#39;3.8&#39;</span>
 
 <span class="nt">services</span><span class="p">:</span>
-<span class="nt">mail</span><span class="p">:</span>
+  <span class="nt">mailserver</span><span class="p">:</span>
-    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver/docker-mailserver:latest</span>
+    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">docker.io/mailserver/docker-mailserver:latest</span>
     <span class="nt">hostname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mail</span>
-    <span class="nt">domainname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">example.org</span>
+    <span class="nt">domainname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">example.com</span>
-    <span class="nt">container_name</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mail</span>
+    <span class="nt">container_name</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver</span>
     <span class="nt">ports</span><span class="p">:</span>
-    <span class="p p-Indicator">-</span> <span class="s">&quot;25:25&quot;</span>
+        <span class="p p-Indicator">-</span> <span class="s">&quot;25:25&quot;</span>
-    <span class="p p-Indicator">-</span> <span class="s">&quot;587:587&quot;</span>
+        <span class="p p-Indicator">-</span> <span class="s">&quot;587:587&quot;</span>
-    <span class="p p-Indicator">-</span> <span class="s">&quot;465:465&quot;</span>
+        <span class="p p-Indicator">-</span> <span class="s">&quot;465:465&quot;</span>
     <span class="nt">volumes</span><span class="p">:</span>
-    <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">./data/:/var/mail/</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">./data/maildata:/var/mail</span>
-    <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">./state/:/var/mail-state/</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">./data/mailstate:/var/mail-state</span>
-    <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">./config/:/tmp/docker-mailserver/</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">./data/maillogs:/var/log/mail</span>
-    <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">/var/ds/wsproxy/letsencrypt/:/etc/letsencrypt/</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">/etc/localtime:/etc/localtime:ro</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">./config/:/tmp/docker-mailserver/</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">/var/ds/wsproxy/letsencrypt/:/etc/letsencrypt/</span>
     <span class="nt">environment</span><span class="p">:</span>
-    <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">PERMIT_DOCKER=network</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">PERMIT_DOCKER=network</span>
-    <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">SSL_TYPE=letsencrypt</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">SSL_TYPE=letsencrypt</span>
-    <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">ONE_DIR=1</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">ONE_DIR=1</span>
-    <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">DMS_DEBUG=1</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">DMS_DEBUG=0</span>
-    <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">SPOOF_PROTECTION=0</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">SPOOF_PROTECTION=0</span>
-    <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">REPORT_RECIPIENT=1</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">REPORT_RECIPIENT=1</span>
-    <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">ENABLE_SPAMASSASSIN=0</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">ENABLE_SPAMASSASSIN=0</span>
-    <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">ENABLE_CLAMAV=0</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">ENABLE_CLAMAV=0</span>
-    <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">ENABLE_FAIL2BAN=1</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">ENABLE_FAIL2BAN=1</span>
-    <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">ENABLE_POSTGREY=0</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">ENABLE_POSTGREY=0</span>
     <span class="nt">cap_add</span><span class="p">:</span>
-    <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">NET_ADMIN</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">NET_ADMIN</span>
-    <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">SYS_PTRACE</span>
+        <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">SYS_PTRACE</span>
 </code></pre></div>
 </div>
 <p>For more details about the environment variables that can be used, and their meaning and possible values, check also these:</p>

edge/examples/tutorials/mailserver-behind-proxy/index.html

@@ -1414,11 +1414,14 @@
       <span class="p p-Indicator">-</span> <span class="s">&quot;4190:4190&quot;</span>
 <span class="p p-Indicator">[</span><span class="nv">...</span><span class="p p-Indicator">]</span>
 </code></pre></div>
-<p>Truncated list of neccessary labels on the mailserver container:</p>
+<p>Truncated list of necessary labels on the mailserver container:</p>
-<div class="highlight"><pre><span></span><code><span class="nt">version</span><span class="p">:</span> <span class="s">&#39;2&#39;</span>
+<div class="highlight"><pre><span></span><code><span class="nt">version</span><span class="p">:</span> <span class="s">&#39;3.8&#39;</span>
 <span class="nt">services</span><span class="p">:</span>
-  <span class="nt">mail</span><span class="p">:</span>
+  <span class="nt">mailserver</span><span class="p">:</span>
-    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver/docker-mailserver:latest</span>
+    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">docker.io/mailserver/docker-mailserver:latest</span>
+    <span class="nt">hostname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mail</span>
+    <span class="nt">domainname</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">example.com</span>
+    <span class="nt">container_name</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver</span>
     <span class="nt">restart</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">always</span>
     <span class="nt">networks</span><span class="p">:</span>
       <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">proxy</span>

edge/faq/index.html

@@ -1856,8 +1856,8 @@ chmod <span class="m">0644</span> cron/sa-learn
 </code></pre></div>
 <p>Then with plain <code>docker-compose</code>:</p>
 <div class="highlight"><pre><span></span><code><span class="nt">services</span><span class="p">:</span>
-  <span class="nt">mail</span><span class="p">:</span>
+  <span class="nt">mailserver</span><span class="p">:</span>
-    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver/docker-mailserver:latest</span>
+    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">docker.io/mailserver/docker-mailserver:latest</span>
     <span class="nt">volumes</span><span class="p">:</span>
       <span class="p p-Indicator">-</span> <span class="l l-Scalar l-Scalar-Plain">./cron/sa-learn:/etc/cron.d/sa-learn</span>
 </code></pre></div>
@@ -1865,8 +1865,8 @@ chmod <span class="m">0644</span> cron/sa-learn
 <div class="highlight"><pre><span></span><code><span class="nt">version</span><span class="p">:</span> <span class="s">&quot;3.3&quot;</span>
 
 <span class="nt">services</span><span class="p">:</span>
-  <span class="nt">mail</span><span class="p">:</span>
+  <span class="nt">mailserver</span><span class="p">:</span>
-    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">mailserver/docker-mailserver:latest</span>
+    <span class="nt">image</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">docker.io/mailserver/docker-mailserver:latest</span>
     <span class="c1"># ...</span>
     <span class="nt">configs</span><span class="p">:</span>
       <span class="p p-Indicator">-</span> <span class="nt">source</span><span class="p">:</span> <span class="l l-Scalar l-Scalar-Plain">my_sa_crontab</span>

edge/sitemap.xml

@@ -2,202 +2,202 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/faq/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/introduction/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/environment/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/pop3/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/setup.sh/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/auth-ldap/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/full-text-search/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/ipv6/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/kubernetes/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/mail-fetchmail/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/mail-sieve/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/optional-config/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/podman/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/mail-forwarding/aws-ses/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/mail-forwarding/relay-hosts/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/maintenance/update-and-cleanup/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/override-defaults/dovecot/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/override-defaults/postfix/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/override-defaults/user-patches/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/best-practices/autodiscover/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/best-practices/dkim/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/best-practices/dmarc/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/best-practices/spf/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/security/fail2ban/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/security/mail_crypt/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/security/ssl/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/security/understanding-the-ports/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/troubleshooting/debugging/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/user-management/accounts/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/user-management/aliases/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/contributing/coding-style/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/contributing/documentation/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/contributing/issues-and-pull-requests/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/contributing/tests/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/tutorials/basic-installation/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/tutorials/blog-posts/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/tutorials/mailserver-behind-proxy/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/uses-cases/forward-only-mailserver-with-ldap-authentication/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/uses-cases/imap-folders/</loc>
-         <lastmod>2021-09-19</lastmod>
+         <lastmod>2021-09-20</lastmod>
          <changefreq>daily</changefreq>
     </url>
 </urlset>