Pārlūkot izejas kodu

Use utf8mb4 charset and utf8mb4_general_ci collation

Peter 3 gadi atpakaļ
vecāks
revīzija
852bf750ca

+ 2 - 2
data/Dockerfiles/dovecot/quarantine_notify.py

@@ -50,7 +50,7 @@ try:
   def query_mysql(query, headers = True, update = False):
   def query_mysql(query, headers = True, update = False):
     while True:
     while True:
       try:
       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:
       except Exception as ex:
         print('%s - trying again...'  % (ex))
         print('%s - trying again...'  % (ex))
         time.sleep(3)
         time.sleep(3)
@@ -166,4 +166,4 @@ try:
       notify_rcpt(record['rcpt'], record['counter'], record['quarantine_acl'], attrs['quarantine_category'])
       notify_rcpt(record['rcpt'], record['counter'], record['quarantine_acl'], attrs['quarantine_category'])
 
 
 finally:
 finally:
-  os.unlink(pidfile)
+  os.unlink(pidfile)

+ 1 - 1
docker-compose.yml

@@ -215,7 +215,7 @@ services:
             - sogo
             - sogo
 
 
     dovecot-mailcow:
     dovecot-mailcow:
-      image: mailcow/dovecot:1.19
+      image: mailcow/dovecot:1.20
       depends_on:
       depends_on:
         - mysql-mailcow
         - mysql-mailcow
       dns:
       dns: