From 633826a372b00a2257ebc3b1dfa6d832da13e453 Mon Sep 17 00:00:00 2001
From: Patrik Kernstock <patrik@kernstock.net>
Date: Fri, 26 Sep 2025 01:26:32 +0200
Subject: [PATCH] Add hostname fields to all containers

---
 docker-compose.yml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 86a4f401af..74d37e00be 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,7 @@ services:
         - ./data/conf/unbound/unbound.conf:/etc/unbound/unbound.conf:ro,Z
       restart: always
       tty: true
+      hostname: unbound
       networks:
         mailcow-network:
           ipv4_address: ${IPV4_NETWORK:-172.22.1}.254
@@ -36,6 +37,7 @@ services:
       restart: always
       ports:
         - "${SQL_PORT:-127.0.0.1:13306}:3306"
+      hostname: mysql
       networks:
         mailcow-network:
           aliases:
@@ -58,6 +60,7 @@ services:
         - REDISMASTERPASS=${REDISMASTERPASS:-}
       sysctls:
         - net.core.somaxconn=4096
+      hostname: redis
       networks:
         mailcow-network:
           ipv4_address: ${IPV4_NETWORK:-172.22.1}.249
@@ -78,6 +81,7 @@ services:
       volumes:
         - ./data/conf/clamav/:/etc/clamav/:Z
         - clamd-db-vol-1:/var/lib/clamav
+      hostname: clamd
       networks:
         mailcow-network:
           aliases:
@@ -108,9 +112,9 @@ services:
         - ./data/conf/rspamd/rspamd.conf.override:/etc/rspamd/rspamd.conf.override:Z
         - rspamd-vol-1:/var/lib/rspamd
       restart: always
-      hostname: rspamd
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
+      hostname: rspamd
       networks:
         mailcow-network:
           aliases:
@@ -194,6 +198,7 @@ services:
         ofelia.job-exec.phpfpm_ldap_sync.schedule: "@every 1m"
         ofelia.job-exec.phpfpm_ldap_sync.no-overlap: "true"
         ofelia.job-exec.phpfpm_ldap_sync.command: "/bin/bash -c \"php /crons/ldap-sync.php || exit 0\""
+      hostname: phpfpm
       networks:
         mailcow-network:
           aliases:
@@ -245,6 +250,7 @@ services:
         ofelia.job-exec.sogo_backup.schedule: "@every 24h"
         ofelia.job-exec.sogo_backup.command: "/bin/bash -c \"[[ $${MASTER} == y ]] && /usr/local/bin/gosu sogo /usr/sbin/sogo-tool backup /sogo_backup ALL || exit 0\""
       restart: always
+      hostname: sogo
       networks:
         mailcow-network:
           ipv4_address: ${IPV4_NETWORK:-172.22.1}.248
@@ -332,6 +338,7 @@ services:
         nofile:
           soft: 20000
           hard: 40000
+      hostname: dovecot
       networks:
         mailcow-network:
           ipv4_address: ${IPV4_NETWORK:-172.22.1}.250
@@ -375,6 +382,7 @@ services:
       restart: always
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
+      hostname: postfix
       networks:
         mailcow-network:
           ipv4_address: ${IPV4_NETWORK:-172.22.1}.253
@@ -398,6 +406,7 @@ services:
       restart: always
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
+      hostname: postfix-tlspol
       networks:
         mailcow-network:
           aliases:
@@ -408,6 +417,7 @@ services:
       restart: always
       environment:
         - TZ=${TZ}
+      hostname: memcached
       networks:
         mailcow-network:
           aliases:
@@ -454,6 +464,7 @@ services:
         - "${HTTPS_BIND:-}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}"
         - "${HTTP_BIND:-}:${HTTP_PORT:-80}:${HTTP_PORT:-80}"
       restart: always
+      hostname: nginx
       networks:
         mailcow-network:
           aliases:
@@ -496,6 +507,7 @@ services:
         - ./data/assets/ssl-example:/var/lib/ssl-example/:ro,Z
         - mysql-socket-vol-1:/var/run/mysqld/:z
       restart: always
+      hostname: acme
       networks:
         mailcow-network:
           aliases:
@@ -520,6 +532,7 @@ services:
       network_mode: "host"
       volumes:
         - /lib/modules:/lib/modules:ro
+      hostname: netfilter
 
     watchdog-mailcow:
       image: ghcr.io/mailcow/watchdog:2.09
@@ -591,6 +604,7 @@ services:
         - MAILQ_THRESHOLD=${MAILQ_THRESHOLD:-20}
         - MAILQ_CRIT=${MAILQ_CRIT:-30}
         - DEV_MODE=${DEV_MODE:-n}
+      hostname: watchdog
       networks:
         mailcow-network:
           aliases:
@@ -611,6 +625,7 @@ services:
         - REDISPASS=${REDISPASS}
       volumes:
         - /var/run/docker.sock:/var/run/docker.sock:ro
+      hostname: dockerapi
       networks:
         mailcow-network:
           aliases:
@@ -630,6 +645,7 @@ services:
         - OLEFY_MINLENGTH=500
         - OLEFY_DEL_TMP=1
         - SKIP_OLEFY=${SKIP_OLEFY:-n}
+      hostname: olefy
       networks:
         mailcow-network:
           aliases:
@@ -651,6 +667,7 @@ services:
         - label=disable
       volumes:
         - /var/run/docker.sock:/var/run/docker.sock:ro
+      hostname: ofelia
       networks:
         mailcow-network:
           aliases: