Update ghcr.io/mailcow/dockerapi Docker tag to v2.13

Signed-off-by: milkmaker <milkmaker@mailcow.de>
Merge pull request #7312 from mailcow/renovate/composer-composer-2.x
2026-07-14 00:36:27 +00:00 · 2026-07-13 18:56:08 +00:00 · 2026-07-13 09:40:58 +02:00 · 2026-07-13 09:40:24 +02:00 · 2026-07-13 08:45:56 +02:00 · 2026-07-13 08:23:57 +02:00
12 changed files with 27 additions and 21 deletions
@@ -14,7 +14,7 @@ jobs:
      pull-requests: write
    steps:
      - name: Mark/Close Stale Issues and Pull Requests 🗑️
-        uses: actions/stale@v10.3.0
+        uses: actions/stale@v10.4.0
        with:
          repo-token: ${{ secrets.STALE_ACTION_PAT }}
          days-before-stale: 60
@@ -12,7 +12,7 @@ jobs:
        with:
          fetch-depth: 0
      - name: Run the Action
-        uses: devops-infra/action-pull-request@v1.3.0
+        uses: devops-infra/action-pull-request@v1.4.0
        with:
          github_token: ${{ secrets.PRTONIGHTLY_ACTION_PAT }}
          title: Automatic PR to nightly from ${{ github.event.repository.updated_at}}
@@ -13,7 +13,7 @@ ARG MEMCACHED_PECL_VERSION=3.4.0
 # renovate: datasource=github-tags depName=phpredis/phpredis versioning=semver-coerced extractVersion=(?<version>.*)$
 ARG REDIS_PECL_VERSION=6.3.0
 # renovate: datasource=github-tags depName=composer/composer versioning=semver-coerced extractVersion=(?<version>.*)$
-ARG COMPOSER_VERSION=2.10.1
+ARG COMPOSER_VERSION=2.10.2

 RUN apk add -U --no-cache autoconf \
  aspell-dev \
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM debian:trixie-slim

 LABEL maintainer="The Infrastructure Company GmbH <info@servercow.de>"

@@ -1,4 +1,4 @@
-@version: 3.38
+@version: 4.8
@include "scl.conf"
 options {
  chain_hostnames(off);
@@ -7,7 +7,7 @@ options {
  dns_cache(no);
  use_fqdn(no);
  owner("root"); group("adm"); perm(0640);
-  stats_freq(0);
+  stats(freq(0));
  bad_hostname("^gconfd$");
 };
 source s_src {
@@ -1,4 +1,4 @@
-@version: 3.38
+@version: 4.8
@include "scl.conf"
 options {
  chain_hostnames(off);
@@ -7,7 +7,7 @@ options {
  dns_cache(no);
  use_fqdn(no);
  owner("root"); group("adm"); perm(0640);
-  stats_freq(0);
+  stats(freq(0));
  bad_hostname("^gconfd$");
 };
 source s_src {
@@ -37,7 +37,7 @@ postscreen_access_list = permit_mynetworks,
  cidr:/opt/postfix/conf/postscreen_access.cidr,
  tcp:127.0.0.1:10027
 postscreen_bare_newline_enable = no
-postscreen_blacklist_action = drop
+postscreen_denylist_action = drop
 postscreen_cache_cleanup_interval = 24h
 postscreen_cache_map = proxy:btree:$data_directory/postscreen_cache
 postscreen_dnsbl_action = enforce
@@ -107,8 +107,6 @@ smtpd_sender_restrictions = reject_authenticated_sender_login_mismatch,
  reject_unknown_sender_domain
 smtpd_soft_error_limit = 3
 smtpd_tls_auth_only = yes
-smtpd_tls_dh1024_param_file = /etc/ssl/mail/dhparams.pem
-smtpd_tls_eecdh_grade = auto
 smtpd_tls_exclude_ciphers = ECDHE-RSA-RC4-SHA, RC4, aNULL, DES-CBC3-SHA, ECDHE-RSA-DES-CBC3-SHA, EDH-RSA-DES-CBC3-SHA
 smtpd_tls_loglevel = 1

@@ -29,7 +29,6 @@ smtps    inet  n       -       n       -       -       smtpd
 # TLS protocol can be modified by setting submission_smtpd_tls_mandatory_protocols in extra.cf
 submission inet n       -       n       -       -       smtpd
  -o smtpd_client_restrictions=permit_mynetworks,permit_sasl_authenticated,reject
-  -o smtpd_enforce_tls=yes
  -o smtpd_tls_security_level=encrypt
  -o smtpd_tls_mandatory_protocols=$submission_smtpd_tls_mandatory_protocols
  -o tls_preempt_cipherlist=yes
@@ -38,7 +37,6 @@ submission inet n       -       n       -       -       smtpd
 10587      inet n       -       n       -       -       smtpd
  -o smtpd_upstream_proxy_protocol=haproxy
  -o smtpd_client_restrictions=permit_mynetworks,permit_sasl_authenticated,reject
-  -o smtpd_enforce_tls=yes
  -o smtpd_tls_security_level=encrypt
  -o smtpd_tls_mandatory_protocols=$submission_smtpd_tls_mandatory_protocols
  -o tls_preempt_cipherlist=yes
@@ -1,6 +1,6 @@
-# Whitelist generated by Postwhite v3.4 on Mon Jun  1 00:52:17 UTC 2026
+# Whitelist generated by Postwhite v3.4 on Wed Jul  1 00:51:20 UTC 2026
 # https://github.com/stevejenkins/postwhite/
-# 2186 total rules
+# 2251 total rules
 2a00:1450:4000::/36	permit
 2a00:1450:4864::/56	permit
 2a01:111:f400::/48	permit
@@ -1528,7 +1528,7 @@
 149.97.173.180	permit
 149.118.160.128/25	permit
 150.136.21.199	permit
-150.171.109.118	permit
+150.171.109.183	permit
 150.230.98.160	permit
 151.145.38.14	permit
 152.67.105.195	permit
@@ -1605,6 +1605,12 @@
 164.152.25.241	permit
 164.177.132.168/30	permit
 165.1.100.0/25	permit
+165.173.128.0/24	permit
+165.173.180.0/24	permit
+165.173.180.250/31	permit
+165.173.182.0/24	permit
+165.173.182.250/31	permit
+165.173.189.205	permit
 166.78.68.0/22	permit
 166.78.68.221	permit
 166.78.69.169	permit
@@ -1651,6 +1657,7 @@
 173.203.81.39	permit
 173.224.161.128/25	permit
 173.224.165.0/26	permit
+173.224.166.48/28	permit
 174.36.84.8/29	permit
 174.36.84.16/29	permit
 174.36.84.32/29	permit
@@ -2171,7 +2178,10 @@
 2001:748:400:3301::4	permit
 2404:6800:4000::/36	permit
 2404:6800:4864::/56	permit
-2603:1061:14:40::1	permit
+2603:1061:14:1c2::1	permit
+2607:13c0:0001:0000:0000:0000:0000:7000/116	permit
+2607:13c0:0002:0000:0000:0000:0000:1000/116	permit
+2607:13c0:0004:0000:0000:0000:0000:0000/116	permit
 2607:f8b0:4000::/36	permit
 2607:f8b0:4864::/56	permit
 2620:109:c003:104::/64	permit
@@ -1086,7 +1086,7 @@
        "rspamd_result": "Rspamd-Ergebnis",
        "sender": "Sender (SMTP)",
        "sender_header": "Sender (\"From\"-Header)",
-        "settings_info": "Maximale Anzahl der zurückgehaltenen E-Mails: %s<br>Maximale Größe einer zu speichernden E-Mail: %s MiB",
+        "settings_info": "Maximale Anzahl der zurückgehaltenen E-Mails (pro Mailbox): %s<br>Maximale Größe einer zu speichernden E-Mail: %s MiB",
        "show_item": "Details",
        "spam": "Spam",
        "spam_score": "Bewertung",
@@ -1087,7 +1087,7 @@
        "rspamd_result": "Rspamd result",
        "sender": "Sender (SMTP)",
        "sender_header": "Sender (\"From\" header)",
-        "settings_info": "Maximum amount of elements to be quarantined: %s<br>Maximum email size: %s MiB",
+        "settings_info": "Maximum amount of elements to be quarantined (per mailbox): %s<br>Maximum email size: %s MiB",
        "show_item": "Show item",
        "spam": "Spam",
        "spam_score": "Score",
@@ -339,7 +339,7 @@ services:
            - dovecot

    postfix-mailcow:
-      image: ghcr.io/mailcow/postfix:3.7.11-2
+      image: ghcr.io/mailcow/postfix:3.10.12-1
      depends_on:
        mysql-mailcow:
          condition: service_started
@@ -601,7 +601,7 @@ services:
            - watchdog

    dockerapi-mailcow:
-      image: ghcr.io/mailcow/dockerapi:2.12
+      image: ghcr.io/mailcow/dockerapi:2.13
      security_opt:
        - label=disable
      restart: always
Author	SHA1	Message	Date
renovate[bot]	a287a8182d	Update ghcr.io/mailcow/dockerapi Docker tag to v2.13 Signed-off-by: milkmaker <milkmaker@mailcow.de>	2026-07-13 18:56:08 +00:00
FreddleSpl0it	c1d75cf808	Merge pull request #7312 from mailcow/renovate/composer-composer-2.x Update dependency composer/composer to v2.10.2	2026-07-13 09:40:58 +02:00
FreddleSpl0it	473fe2885d	Merge pull request #7326 from ralfbergs/fix/quarantine-text-refining Refined wording for displaying of active settings on quarantine page.	2026-07-13 09:40:24 +02:00
FreddleSpl0it	31e1550668	[Postfix] change postscreen blacklist_action to denylist_action	2026-07-13 08:45:56 +02:00
FreddleSpl0it	315f55bc65	Merge pull request #7323 from DerLinkman/feat/postfix-deb13 postfix: migrate from bookworm to trixie	2026-07-13 08:23:57 +02:00
Ralf Bergs	e696ee2f6c	Refined wording for displaying of active settings on quarantine page.	2026-07-12 17:22:15 +02:00
renovate[bot]	d65aa11870	Update devops-infra/action-pull-request action to v1.4.0 (#7321 ) Signed-off-by: milkmaker <milkmaker@mailcow.de> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-07-12 15:20:18 +02:00
renovate[bot]	f6630e5b43	Update actions/stale action to v10.4.0 (#7322 ) Signed-off-by: milkmaker <milkmaker@mailcow.de> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-07-12 15:19:49 +02:00
DerLinkman	98e26c5603	compose: upgrade Postfix	2026-07-10 18:41:58 +02:00
DerLinkman	3098caebbc	migrate postfix to trixie	2026-07-10 18:29:45 +02:00
renovate[bot]	94e23a3cd3	Update dependency composer/composer to v2.10.2 Signed-off-by: milkmaker <milkmaker@mailcow.de>	2026-07-01 09:32:23 +00:00
milkmaker	1840074991	update postscreen_access.cidr (#7311 )	2026-07-01 11:31:58 +02:00
FreddleSpl0it	99768e16f5	Merge pull request #7305 from mailcow/feat/nginx-1.30.3 [Nignx] Update to 1.30.3	2026-06-25 12:20:25 +02:00