From 4576285b833de3f5d9618aa65baa34b1b1911ed4 Mon Sep 17 00:00:00 2001 From: josep-tecnativa Date: Tue, 19 Dec 2023 11:56:11 +0100 Subject: [PATCH 1/2] [IMP] Use docker-mailserver v13 as a default version --- copier.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/copier.yml b/copier.yml index e5aa1338..3bfd7b6f 100644 --- a/copier.yml +++ b/copier.yml @@ -477,7 +477,7 @@ smtp_relay_password: smtp_relay_version: type: str when: *has_smtp - default: "10" + default: "13" help: >- Doodba uses docker-mailserver as the local mail relay. From 577ffabbd56904103712841d0dc81d6ad0324c8c Mon Sep 17 00:00:00 2001 From: josep-tecnativa Date: Tue, 19 Dec 2023 12:13:30 +0100 Subject: [PATCH 2/2] [FIX] Since docker-mailserver v11.0, DMS_DEBUG does not exists https://github.com/docker-mailserver/docker-mailserver/pull/2523 The variable DMS_DEBUG will be replaced by LOG_LEVEL, assigning it the value 'info' (equivalent to the value 0 in DMS_DEBUG) in versions greater than or equal to version 11.0 of docker-mailserver. --- common.yaml.jinja | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common.yaml.jinja b/common.yaml.jinja index 2bd7a657..88b3cc3e 100644 --- a/common.yaml.jinja +++ b/common.yaml.jinja @@ -63,7 +63,11 @@ services: - SYS_PTRACE environment: DEFAULT_RELAY_HOST: "[{{ smtp_relay_host }}]:{{ smtp_relay_port }}" + {% if smtp_relay_version|float < 11.0 %} DMS_DEBUG: 0 + {% else %} + LOG_LEVEL: info + {% endif %} ENABLE_SRS: 1 ONE_DIR: 1 PERMIT_DOCKER: connected-networks