Merge branch 'master' into feat/remove-env-one-dir

.github/workflows/docs-preview-deploy.yml

@@ -23,14 +23,13 @@ jobs:
       # Restore workflow context #
       # ======================== #
 
-      # The official Github Action for downloading artifacts does not support multi-workflow
+      # Retrieve the artifact uploaded from `docs-preview-prepare.yml` workflow run that triggered this deployment
       - name: 'Download build artifact'
-        uses: dawidd6/action-download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          run_id: ${{ github.event.workflow_run.id }}
-          workflow: docs-preview-prepare.yml
           name: preview-build
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
 
       - name: 'Extract build artifact'
         run: tar -xf artifact.tar.zst

CHANGELOG.md

@@ -24,6 +24,11 @@ The most noteworthy change of this release is the update of the container's base
     - The script now uses `/etc/os-release` to determine the release name of Debian
     - Removed custom installations of Fail2Ban, getmail6 and Rspamd
     - Updated packages lists and added comments for maintainability
+- OpenDMARC upgrade: `v1.4.0` => `v1.4.2` ([#3841](https://github.com/docker-mailserver/docker-mailserver/pull/3841))
+  - Previous versions of OpenDMARC would place incoming mail from domains announcing `p=quarantaine` (_that fail the DMARC check_) into the [Postfix "hold" queue](https://www.postfix.org/QSHAPE_README.html#hold_queue) until administrative intervention.
+  - [OpenDMARC v1.4.2 has disabled that feature by default](https://github.com/trusteddomainproject/OpenDMARC/issues/105), but it can be enabled again by adding the setting `HoldQuarantinedMessages true` to [`/etc/opendmarc.conf`](https://github.com/docker-mailserver/docker-mailserver/blob/v13.3.1/target/opendmarc/opendmarc.conf) (_provided from DMS_).
+    - [Our `user-patches.sh` feature](https://docker-mailserver.github.io/docker-mailserver/latest/config/advanced/override-defaults/user-patches/) provides a convenient approach to updating that config file.
+    - Please let us know if you disagree with the upstream default being carried with DMS, or the value of providing alternative configuration support within DMS.
 - **Postfix:**
   - Postfix upgrade from 3.5 to 3.7 ([#3403](https://github.com/docker-mailserver/docker-mailserver/pull/3403))
     - `compatibility_level` was raised from `2` to `3.6`

CONTRIBUTORS.md

@@ -134,13 +134,6 @@ Thanks goes to these wonderful people ✨
         </a>
     </td></tr>
 <tr>
-    <td align="center">
-        <a href="https://github.com/alinmear">
-            <img src="https://avatars.githubusercontent.com/u/1282224?v=4" width="100;" alt="alinmear"/>
-            <br />
-            <sub><b>alinmear</b></sub>
-        </a>
-    </td>
     <td align="center">
         <a href="https://github.com/ap-wtioit">
             <img src="https://avatars.githubusercontent.com/u/38032588?v=4" width="100;" alt="ap-wtioit"/>
@@ -148,6 +141,13 @@ Thanks goes to these wonderful people ✨
             <sub><b>ap-wtioit</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/alinmear">
+            <img src="https://avatars.githubusercontent.com/u/1282224?v=4" width="100;" alt="alinmear"/>
+            <br />
+            <sub><b>alinmear</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/dominikwinter">
             <img src="https://avatars.githubusercontent.com/u/2269503?v=4" width="100;" alt="dominikwinter"/>
@@ -815,13 +815,20 @@ Thanks goes to these wonderful people ✨
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/nilshoell">
+        <a href="https://github.com/auchri">
-            <img src="https://avatars.githubusercontent.com/u/33981934?v=4" width="100;" alt="nilshoell"/>
+            <img src="https://avatars.githubusercontent.com/u/5092164?v=4" width="100;" alt="auchri"/>
             <br />
-            <sub><b>nilshoell</b></sub>
+            <sub><b>auchri</b></sub>
         </a>
     </td></tr>
 <tr>
+    <td align="center">
+        <a href="https://github.com/stephan-devop">
+            <img src="https://avatars.githubusercontent.com/u/59093905?v=4" width="100;" alt="stephan-devop"/>
+            <br />
+            <sub><b>stephan-devop</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/stigok">
             <img src="https://avatars.githubusercontent.com/u/952936?v=4" width="100;" alt="stigok"/>
@@ -856,15 +863,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>TechnicLab</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/thomasschmit">
             <img src="https://avatars.githubusercontent.com/u/6014433?v=4" width="100;" alt="thomasschmit"/>
             <br />
             <sub><b>thomasschmit</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/Thiritin">
             <img src="https://avatars.githubusercontent.com/u/6755282?v=4" width="100;" alt="Thiritin"/>
@@ -899,15 +906,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>Twist235</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/k3it">
             <img src="https://avatars.githubusercontent.com/u/9923389?v=4" width="100;" alt="k3it"/>
             <br />
             <sub><b>k3it</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/Drakulix">
             <img src="https://avatars.githubusercontent.com/u/4404502?v=4" width="100;" alt="Drakulix"/>
@@ -942,15 +949,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>Zepmann</b></sub>
         </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/allddd">
-            <img src="https://avatars.githubusercontent.com/u/117767298?v=4" width="100;" alt="allddd"/>
-            <br />
-            <sub><b>allddd</b></sub>
-        </a>
     </td></tr>
 <tr>
+    <td align="center">
+        <a href="https://github.com/nilshoell">
+            <img src="https://avatars.githubusercontent.com/u/33981934?v=4" width="100;" alt="nilshoell"/>
+            <br />
+            <sub><b>nilshoell</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/nknapp">
             <img src="https://avatars.githubusercontent.com/u/636150?v=4" width="100;" alt="nknapp"/>
@@ -985,15 +992,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>mrPjer</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/p3dda">
             <img src="https://avatars.githubusercontent.com/u/2871413?v=4" width="100;" alt="p3dda"/>
             <br />
             <sub><b>p3dda</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/peter-hartmann">
             <img src="https://avatars.githubusercontent.com/u/20216585?v=4" width="100;" alt="peter-hartmann"/>
@@ -1028,15 +1035,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>norrs</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/MightySCollins">
             <img src="https://avatars.githubusercontent.com/u/8594759?v=4" width="100;" alt="MightySCollins"/>
             <br />
             <sub><b>MightySCollins</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/501st-alpha1">
             <img src="https://avatars.githubusercontent.com/u/676533?v=4" width="100;" alt="501st-alpha1"/>
@@ -1071,15 +1078,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>shyim</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/sjmudd">
             <img src="https://avatars.githubusercontent.com/u/116250?v=4" width="100;" alt="sjmudd"/>
             <br />
             <sub><b>sjmudd</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/simonsystem">
             <img src="https://avatars.githubusercontent.com/u/5014686?v=4" width="100;" alt="simonsystem"/>
@@ -1088,10 +1095,10 @@ Thanks goes to these wonderful people ✨
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/stephan-devop">
+        <a href="https://github.com/allddd">
-            <img src="https://avatars.githubusercontent.com/u/59093905?v=4" width="100;" alt="stephan-devop"/>
+            <img src="https://avatars.githubusercontent.com/u/117767298?v=4" width="100;" alt="allddd"/>
             <br />
-            <sub><b>stephan-devop</b></sub>
+            <sub><b>allddd</b></sub>
         </a>
     </td>
     <td align="center">
@@ -1114,15 +1121,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>odinis</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/okamidash">
             <img src="https://avatars.githubusercontent.com/u/43506079?v=4" width="100;" alt="okamidash"/>
             <br />
             <sub><b>okamidash</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/olaf-mandel">
             <img src="https://avatars.githubusercontent.com/u/918687?v=4" width="100;" alt="olaf-mandel"/>
@@ -1157,15 +1164,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>rhyst</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/rmlhuk">
             <img src="https://avatars.githubusercontent.com/u/7514163?v=4" width="100;" alt="rmlhuk"/>
             <br />
             <sub><b>rmlhuk</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/rriski">
             <img src="https://avatars.githubusercontent.com/u/25483483?v=4" width="100;" alt="rriski"/>
@@ -1200,15 +1207,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>squash</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/strarsis">
             <img src="https://avatars.githubusercontent.com/u/9271436?v=4" width="100;" alt="strarsis"/>
             <br />
             <sub><b>strarsis</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/tamueller">
             <img src="https://avatars.githubusercontent.com/u/1902960?v=4" width="100;" alt="tamueller"/>
@@ -1243,15 +1250,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>worldworm</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/arcaine2">
             <img src="https://avatars.githubusercontent.com/u/12737015?v=4" width="100;" alt="arcaine2"/>
             <br />
             <sub><b>arcaine2</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/awb99">
             <img src="https://avatars.githubusercontent.com/u/10854682?v=4" width="100;" alt="awb99"/>
@@ -1286,15 +1293,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>dimalo</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/eleith">
             <img src="https://avatars.githubusercontent.com/u/284832?v=4" width="100;" alt="eleith"/>
             <br />
             <sub><b>eleith</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/ghnp5">
             <img src="https://avatars.githubusercontent.com/u/57591332?v=4" width="100;" alt="ghnp5"/>
@@ -1329,15 +1336,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>idaadi</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/ixeft">
             <img src="https://avatars.githubusercontent.com/u/422722?v=4" width="100;" alt="ixeft"/>
             <br />
             <sub><b>ixeft</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/jjtt">
             <img src="https://avatars.githubusercontent.com/u/3908945?v=4" width="100;" alt="jjtt"/>
@@ -1372,15 +1379,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>callmemagnus</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/marios88">
             <img src="https://avatars.githubusercontent.com/u/302688?v=4" width="100;" alt="marios88"/>
             <br />
             <sub><b>marios88</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/matrixes">
             <img src="https://avatars.githubusercontent.com/u/46491408?v=4" width="100;" alt="matrixes"/>
@@ -1395,13 +1402,6 @@ Thanks goes to these wonderful people ✨
             <sub><b>mchamplain</b></sub>
         </a>
     </td>
-    <td align="center">
-        <a href="https://github.com/auchri">
-            <img src="https://avatars.githubusercontent.com/u/5092164?v=4" width="100;" alt="auchri"/>
-            <br />
-            <sub><b>auchri</b></sub>
-        </a>
-    </td>
     <td align="center">
         <a href="https://github.com/arkanovicz">
             <img src="https://avatars.githubusercontent.com/u/475277?v=4" width="100;" alt="arkanovicz"/>
@@ -1539,10 +1539,10 @@ Thanks goes to these wonderful people ✨
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/thechubbypanda">
+        <a href="https://github.com/froks">
-            <img src="https://avatars.githubusercontent.com/u/33595996?v=4" width="100;" alt="thechubbypanda"/>
+            <img src="https://avatars.githubusercontent.com/u/734686?v=4" width="100;" alt="froks"/>
             <br />
-            <sub><b>thechubbypanda</b></sub>
+            <sub><b>froks</b></sub>
         </a>
     </td>
     <td align="center">
@@ -1696,6 +1696,13 @@ Thanks goes to these wonderful people ✨
             <sub><b>crash7</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/thechubbypanda">
+            <img src="https://avatars.githubusercontent.com/u/33595996?v=4" width="100;" alt="thechubbypanda"/>
+            <br />
+            <sub><b>thechubbypanda</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/KCrawley">
             <img src="https://avatars.githubusercontent.com/u/60195478?v=4" width="100;" alt="KCrawley"/>
@@ -1716,15 +1723,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>JustAnother1</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/LeoWinterDE">
             <img src="https://avatars.githubusercontent.com/u/1300141?v=4" width="100;" alt="LeoWinterDE"/>
             <br />
             <sub><b>LeoWinterDE</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/linhandev">
             <img src="https://avatars.githubusercontent.com/u/29757093?v=4" width="100;" alt="linhandev"/>
@@ -1759,15 +1766,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>madmath03</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/maxemann96">
             <img src="https://avatars.githubusercontent.com/u/4399206?v=4" width="100;" alt="maxemann96"/>
             <br />
             <sub><b>maxemann96</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/dragetd">
             <img src="https://avatars.githubusercontent.com/u/3639577?v=4" width="100;" alt="dragetd"/>
@@ -1802,15 +1809,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>mcchots</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/MohammedNoureldin">
             <img src="https://avatars.githubusercontent.com/u/14913147?v=4" width="100;" alt="MohammedNoureldin"/>
             <br />
             <sub><b>MohammedNoureldin</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/mpldr">
             <img src="https://avatars.githubusercontent.com/u/33086936?v=4" width="100;" alt="mpldr"/>
@@ -1839,13 +1846,6 @@ Thanks goes to these wonderful people ✨
             <sub><b>radicand</b></sub>
         </a>
     </td>
-    <td align="center">
-        <a href="https://github.com/froks">
-            <img src="https://avatars.githubusercontent.com/u/734686?v=4" width="100;" alt="froks"/>
-            <br />
-            <sub><b>froks</b></sub>
-        </a>
-    </td>
     <td align="center">
         <a href="https://github.com/fkefer">
             <img src="https://avatars.githubusercontent.com/u/1140674?v=4" width="100;" alt="fkefer"/>
@@ -1911,6 +1911,13 @@ Thanks goes to these wonderful people ✨
             <sub><b>Influencer</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/JamBalaya56562">
+            <img src="https://avatars.githubusercontent.com/u/88115388?v=4" width="100;" alt="JamBalaya56562"/>
+            <br />
+            <sub><b>JamBalaya56562</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/jcalfee">
             <img src="https://avatars.githubusercontent.com/u/204121?v=4" width="100;" alt="jcalfee"/>
@@ -1931,15 +1938,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>init-js</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/Jeidnx">
             <img src="https://avatars.githubusercontent.com/u/55414029?v=4" width="100;" alt="Jeidnx"/>
             <br />
             <sub><b>Jeidnx</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/JiLleON">
             <img src="https://avatars.githubusercontent.com/u/28780165?v=4" width="100;" alt="JiLleON"/>
@@ -1974,15 +1981,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>JOduMonT</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/Kaan88">
             <img src="https://avatars.githubusercontent.com/u/1260152?v=4" width="100;" alt="Kaan88"/>
             <br />
             <sub><b>Kaan88</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/akkumar">
             <img src="https://avatars.githubusercontent.com/u/38454?v=4" width="100;" alt="akkumar"/>

README.md

@@ -4,22 +4,27 @@
 
 [ci::status]: https://img.shields.io/github/actions/workflow/status/docker-mailserver/docker-mailserver/default_on_push.yml?branch=master&color=blue&label=CI&logo=github&logoColor=white&style=for-the-badge
 [ci::github]: https://github.com/docker-mailserver/docker-mailserver/actions
-[docker::pulls]: https://img.shields.io/docker/pulls/mailserver/docker-mailserver.svg?style=for-the-badge&logo=docker&logoColor=white
+[docker::pulls]: https://img.shields.io/docker/pulls/mailserver/docker-mailserver.svg?style=for-the-badge&logo=docker&logoColor=white&color=blue
 [docker::hub]: https://hub.docker.com/r/mailserver/docker-mailserver/
-[documentation::badge]: https://img.shields.io/badge/DOCUMENTATION-GH%20PAGES-0078D4?style=for-the-badge&logo=git&logoColor=white
+[documentation::badge]: https://img.shields.io/badge/DOCUMENTATION-GH%20PAGES-0078D4?style=for-the-badge&logo=googledocs&logoColor=white
 [documentation::web]: https://docker-mailserver.github.io/docker-mailserver/latest/
 
 ## :page_with_curl: About
 
-A production-ready fullstack but simple containerized mail server (SMTP, IMAP, LDAP, Anti-spam, Anti-virus, etc.). Only configuration files, no SQL database. Keep it simple and versioned. Easy to deploy and upgrade. Originally created by @tomav, this project is now maintained by volunteers since January 2021.
+A production-ready fullstack but simple containerized mail server (SMTP, IMAP, LDAP, Anti-spam, Anti-virus, etc.).
+- Only configuration files, no SQL database. Keep it simple and versioned. Easy to deploy and upgrade.
+- Originally created by [@tomav](https://github.com/tomav), this project is now maintained by volunteers since January 2021.
 
-## :bulb: Documentation
+## <!-- Adds a thin line break separator style -->
 
-We provide a [dedicated documentation][documentation::web] hosted on GitHub Pages. Make sure to read it as it contains all the information necessary to set up and configure your mail server. The documentation is crafted with Markdown & [MkDocs Material](https://squidfunk.github.io/mkdocs-material/).
+> [!TIP]
+> Be sure to read [our documentation][documentation::web]. It provides guidance on initial setup of your mail server.
 
-## :boom: Issues
+> [!IMPORTANT]
-
+> If you have issues, please search through [the documentation][documentation::web] **for your version** before opening an issue.
-If you have issues, please search through [the documentation][documentation::web] **for your version** before opening an issue. The issue tracker is for issues, not for personal support. Make sure the version of the documentation matches the image version you're using!
+> 
+> The issue tracker is for issues, not for personal support.  
+> Make sure the version of the documentation matches the image version you're using!
 
 ## :link: Links to Useful Resources