Merge branch 'master' into sed

.github/workflows/linting.yml

@@ -1,10 +1,10 @@
 name: Lint
 
 on:
+  # A workflow that creates a PR will not trigger this workflow,
+  # Providing a manual trigger as a workaround
+  workflow_dispatch:
   pull_request:
-    paths-ignore:
-      # Managed by workflow: contributors.yml
-      - CONTRIBUTORS.md
   push:
     branches: [ master ]
 

CHANGELOG.md

@@ -27,10 +27,13 @@ All notable changes to this project will be documented in this file. The format
 - **Internal**:
   - The container startup welcome log message now references `DMS_RELEASE` ([#3676](https://github.com/docker-mailserver/docker-mailserver/pull/3676))
   - `VERSION` was incremented for prior releases to be notified of the v13.0.1 patch release ([#3676](https://github.com/docker-mailserver/docker-mailserver/pull/3676))
+  - `VERSION` is no longer included in the image ([#3711](https://github.com/docker-mailserver/docker-mailserver/pull/3711))
   - Update-check: fix 'read' exit status ([#3688](https://github.com/docker-mailserver/docker-mailserver/pull/3688))
   - Fix error, when ENABLE_QUOTAS=0 was set ([#3715](https://github.com/docker-mailserver/docker-mailserver/pull/3715))
 - **Rspamd:**
   - Switch to official arm64 packages to avoid segfaults ([#3686](https://github.com/docker-mailserver/docker-mailserver/pull/3686))
+- **CI / Automation:**
+  - The lint workflow can now be manually triggered by maintainers ([#3714]https://github.com/docker-mailserver/docker-mailserver/pull/3714)
 
 ## [v13.0.1](https://github.com/docker-mailserver/docker-mailserver/releases/tag/v13.0.1)
 

CONTRIBUTORS.md

@@ -442,6 +442,13 @@ Thanks goes to these wonderful people ✨
             <sub><b>pbek</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/reneploetz">
+            <img src="https://avatars.githubusercontent.com/u/3007925?v=4" width="100;" alt="reneploetz"/>
+            <br />
+            <sub><b>reneploetz</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/Rubytastic2">
             <img src="https://avatars.githubusercontent.com/u/21036612?v=4" width="100;" alt="Rubytastic2"/>
@@ -469,15 +476,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>Zehir</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/guardiande">
             <img src="https://avatars.githubusercontent.com/u/4947715?v=4" width="100;" alt="guardiande"/>
             <br />
             <sub><b>guardiande</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/kamuri">
             <img src="https://avatars.githubusercontent.com/u/2777769?v=4" width="100;" alt="kamuri"/>
@@ -512,15 +519,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>m-schmoock</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/VanVan">
             <img src="https://avatars.githubusercontent.com/u/388581?v=4" width="100;" alt="VanVan"/>
             <br />
             <sub><b>VanVan</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/elbracht">
             <img src="https://avatars.githubusercontent.com/u/2912000?v=4" width="100;" alt="elbracht"/>
@@ -555,15 +562,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>ubenmackin</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/craue">
             <img src="https://avatars.githubusercontent.com/u/800119?v=4" width="100;" alt="craue"/>
             <br />
             <sub><b>craue</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/danielpanteleit">
             <img src="https://avatars.githubusercontent.com/u/15816819?v=4" width="100;" alt="danielpanteleit"/>
@@ -598,15 +605,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>emazzotta</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/fl42">
             <img src="https://avatars.githubusercontent.com/u/46161216?v=4" width="100;" alt="fl42"/>
             <br />
             <sub><b>fl42</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/ipernet">
             <img src="https://avatars.githubusercontent.com/u/1324566?v=4" width="100;" alt="ipernet"/>
@@ -641,15 +648,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>millaguie</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/jedateach">
             <img src="https://avatars.githubusercontent.com/u/1356335?v=4" width="100;" alt="jedateach"/>
             <br />
             <sub><b>jedateach</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/spacecowboy">
             <img src="https://avatars.githubusercontent.com/u/223655?v=4" width="100;" alt="spacecowboy"/>
@@ -684,15 +691,15 @@ Thanks goes to these wonderful people ✨
             <br />
             <sub><b>keslerm</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/castorinop">
             <img src="https://avatars.githubusercontent.com/u/370992?v=4" width="100;" alt="castorinop"/>
             <br />
             <sub><b>castorinop</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/p-fruck">
             <img src="https://avatars.githubusercontent.com/u/30511472?v=4" width="100;" alt="p-fruck"/>
@@ -707,13 +714,6 @@ Thanks goes to these wonderful people ✨
             <sub><b>Rillke</b></sub>
         </a>
     </td>
-    <td align="center">
-        <a href="https://github.com/reneploetz">
-            <img src="https://avatars.githubusercontent.com/u/3007925?v=4" width="100;" alt="reneploetz"/>
-            <br />
-            <sub><b>reneploetz</b></sub>
-        </a>
-    </td>
     <td align="center">
         <a href="https://github.com/bobbravo2">
             <img src="https://avatars.githubusercontent.com/u/348865?v=4" width="100;" alt="bobbravo2"/>

Dockerfile

@@ -277,8 +277,6 @@ RUN <<EOF
   update-locale
 EOF
 
-COPY VERSION /
-
 COPY \
   target/bin/* \
   target/scripts/*.sh \