diff --git a/.github/workflows/docs-preview-deploy.yml b/.github/workflows/docs-preview-deploy.yml
index 93819efa..3b6f3c67 100644
--- a/.github/workflows/docs-preview-deploy.yml
+++ b/.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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f411ca3..41e6d5e9 100644
--- a/CHANGELOG.md
+++ b/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`
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index f86435f4..72784ab0 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -134,13 +134,6 @@ Thanks goes to these wonderful people ✨
-
-
-
-
- alinmear
-
- |
@@ -148,6 +141,13 @@ Thanks goes to these wonderful people ✨
ap-wtioit
|
+
+
+
+
+ alinmear
+
+ |
@@ -815,13 +815,20 @@ Thanks goes to these wonderful people ✨
|
-
-
+
+
- nilshoell
+ auchri
|
+
+
+
+
+ stephan-devop
+
+ |
@@ -856,15 +863,15 @@ Thanks goes to these wonderful people ✨
TechnicLab
- |
+
+
thomasschmit
- |
-
+
@@ -899,15 +906,15 @@ Thanks goes to these wonderful people ✨
Twist235
- |
+
+
k3it
- |
-
+
@@ -942,15 +949,15 @@ Thanks goes to these wonderful people ✨
Zepmann
- |
-
-
-
-
- allddd
-
|
+
+
+
+
+ nilshoell
+
+ |
@@ -985,15 +992,15 @@ Thanks goes to these wonderful people ✨
mrPjer
- |
+
+
p3dda
- |
-
+
@@ -1028,15 +1035,15 @@ Thanks goes to these wonderful people ✨
norrs
- |
+
+
MightySCollins
- |
-
+
@@ -1071,15 +1078,15 @@ Thanks goes to these wonderful people ✨
shyim
- |
+
+
sjmudd
- |
-
+
@@ -1088,10 +1095,10 @@ Thanks goes to these wonderful people ✨
|
-
-
+
+
- stephan-devop
+ allddd
|
@@ -1114,15 +1121,15 @@ Thanks goes to these wonderful people ✨
odinis
- |
+
+
okamidash
- |
-
+
@@ -1157,15 +1164,15 @@ Thanks goes to these wonderful people ✨
rhyst
- |
+
+
rmlhuk
- |
-
+
@@ -1200,15 +1207,15 @@ Thanks goes to these wonderful people ✨
squash
- |
+
+
strarsis
- |
-
+
@@ -1243,15 +1250,15 @@ Thanks goes to these wonderful people ✨
worldworm
- |
+
+
arcaine2
- |
-
+
@@ -1286,15 +1293,15 @@ Thanks goes to these wonderful people ✨
dimalo
- |
+
+
eleith
- |
-
+
@@ -1329,15 +1336,15 @@ Thanks goes to these wonderful people ✨
idaadi
- |
+
+
ixeft
- |
-
+
@@ -1372,15 +1379,15 @@ Thanks goes to these wonderful people ✨
callmemagnus
- |
+
+
marios88
- |
-
+
@@ -1395,13 +1402,6 @@ Thanks goes to these wonderful people ✨
mchamplain
|
-
-
-
-
- auchri
-
- |
@@ -1539,10 +1539,10 @@ Thanks goes to these wonderful people ✨
|
-
-
+
+
- thechubbypanda
+ froks
|
@@ -1696,6 +1696,13 @@ Thanks goes to these wonderful people ✨
crash7
|
+
+
+
+
+ thechubbypanda
+
+ |
@@ -1716,15 +1723,15 @@ Thanks goes to these wonderful people ✨
JustAnother1
- |
+
+
LeoWinterDE
- |
-
+
@@ -1759,15 +1766,15 @@ Thanks goes to these wonderful people ✨
madmath03
- |
+
+
maxemann96
- |
-
+
@@ -1802,15 +1809,15 @@ Thanks goes to these wonderful people ✨
mcchots
- |
+
+
MohammedNoureldin
- |
-
+
@@ -1839,13 +1846,6 @@ Thanks goes to these wonderful people ✨
radicand
|
-
-
-
-
- froks
-
- |
@@ -1911,6 +1911,13 @@ Thanks goes to these wonderful people ✨
Influencer
|
+
+
+
+
+ JamBalaya56562
+
+ |
@@ -1931,15 +1938,15 @@ Thanks goes to these wonderful people ✨
init-js
- |
+
+
Jeidnx
- |
-
+
@@ -1974,15 +1981,15 @@ Thanks goes to these wonderful people ✨
JOduMonT
- |
+
+
Kaan88
- |
-
+
diff --git a/README.md b/README.md
index e81d21ad..cfd453ff 100644
--- a/README.md
+++ b/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
+##
-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
-
-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!
+> [!IMPORTANT]
+> 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!
## :link: Links to Useful Resources
|