From 852bf750cac27e3a4aa182189aae8e3082b8efff Mon Sep 17 00:00:00 2001
From: Peter <magic@kthx.at>
Date: Mon, 19 Sep 2022 19:29:55 +0200
Subject: [PATCH] Use utf8mb4 charset and utf8mb4_general_ci collation
---
data/Dockerfiles/dovecot/quarantine_notify.py | 4 ++--
docker-compose.yml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/Dockerfiles/dovecot/quarantine_notify.py b/data/Dockerfiles/dovecot/quarantine_notify.py
index f60a3226..65f2a0e6 100755
--- a/data/Dockerfiles/dovecot/quarantine_notify.py
+++ b/data/Dockerfiles/dovecot/quarantine_notify.py
@@ -50,7 +50,7 @@ try:
def query_mysql(query, headers = True, update = False):
while True:
try:
- cnx = mysql.connector.connect(unix_socket = '/var/run/mysqld/mysqld.sock', user=os.environ.get('DBUSER'), passwd=os.environ.get('DBPASS'), database=os.environ.get('DBNAME'), charset="utf8")
+ cnx = mysql.connector.connect(unix_socket = '/var/run/mysqld/mysqld.sock', user=os.environ.get('DBUSER'), passwd=os.environ.get('DBPASS'), database=os.environ.get('DBNAME'), charset="utf8mb4", collation="utf8mb4_general_ci")
except Exception as ex:
print('%s - trying again...' % (ex))
time.sleep(3)
@@ -166,4 +166,4 @@ try:
notify_rcpt(record['rcpt'], record['counter'], record['quarantine_acl'], attrs['quarantine_category'])
finally:
- os.unlink(pidfile)
\ No newline at end of file
+ os.unlink(pidfile)
diff --git a/docker-compose.yml b/docker-compose.yml
index ad78670d..bf914e73 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -215,7 +215,7 @@ services:
- sogo
dovecot-mailcow:
- image: mailcow/dovecot:1.19
+ image: mailcow/dovecot:1.20
depends_on:
- mysql-mailcow
dns: