From 198e32c62bf84544ea109189af85695812d5a7db Mon Sep 17 00:00:00 2001
From: qiaofeng1227 <76487013@qq.com>
Date: Tue, 7 Dec 2021 16:08:05 +0800
Subject: [PATCH] Update docker-compose.yml

---
 docker-compose.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 3ba38c8..0f3c5bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,7 @@ services:
       - FRAPPE_PY_PORT=${APP_PORT}
       - FRAPPE_SOCKETIO=frappe-socketio
       - SOCKETIO_PORT=9000
+      - SKIP_NGINX_TEMPLATE_GENERATION=${SKIP_NGINX_TEMPLATE_GENERATION}
     volumes:
       - sites-vol:/var/www/html/sites:rw
       - assets-vol:/assets:rw
@@ -28,6 +29,7 @@ services:
       - REDIS_SOCKETIO=redis-socketio:6379
       - SOCKETIO_PORT=9000
       - AUTO_MIGRATE=1
+      - WORKER_CLASS=${WORKER_CLASS}
     volumes:
       - sites-vol:/home/frappe/frappe-bench/sites:rw
       - assets-vol:/home/frappe/frappe-bench/sites/assets:rw
@@ -120,8 +122,14 @@ services:
     restart: always
     ports:
       - ${DB_MARIADB_PORT}:3306
+    command:
+      - --character-set-server=utf8mb4
+      - --collation-server=utf8mb4_unicode_ci
+      - --skip-character-set-client-handshake
+      - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6
     environment:
       - MYSQL_ROOT_PASSWORD=${DB_MARIADB_PASSWORD}
+      - MYSQL_INITDB_SKIP_TZINFO=1
     volumes:
       - ./src/installation/frappe-mariadb.cnf:/etc/mysql/conf.d/frappe.cnf
       - ${VOLUMES_PATH_PREFIX}/mariadb-vol:/var/lib/mysql
@@ -151,4 +159,4 @@ volumes:
 
 networks:
   default:
-      name: "${APP_NETWORK}"
\ No newline at end of file
+      name: "${APP_NETWORK}"