Merge branch 'staging' into nightly

2024-08-08 08:44:12 +02:00
parent 772d5c51fd 824a473fea
commit d0ecb72e08
3 changed files with 118 additions and 9 deletions
@@ -481,7 +481,7 @@ services:
        - /lib/modules:/lib/modules:ro

    watchdog-mailcow:
-      image: mailcow/watchdog:2.03
+      image: mailcow/watchdog:2.04
      dns:
        - ${IPV4_NETWORK:-172.22.1}.254
      tmpfs:
@@ -613,9 +613,10 @@ services:
    ofelia-mailcow:
      image: mcuadros/ofelia:latest
      restart: always
-      command: daemon --docker
+      command: daemon --docker -f label=com.docker.compose.project=${COMPOSE_PROJECT_NAME}
      environment:
        - TZ=${TZ}
+        - COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}
      depends_on:
        - sogo-mailcow
        - dovecot-mailcow