Răsfoiți Sursa

Make fully compatible with MariaDB 10.4/11.6 and MySQL 8.0/8.4 (#1329)

Mark Shust 2 luni în urmă
părinte
comite
c57a190c54
2 a modificat fișierele cu 3 adăugiri și 1 ștergeri
  1. 1 1
      compose/compose.healthcheck.yaml
  2. 2 0
      compose/compose.yaml

+ 1 - 1
compose/compose.healthcheck.yaml

@@ -21,7 +21,7 @@ services:
 
   db:
     healthcheck:
-      test: "mysqladmin ping -h localhost -u root -pmagento"
+      test: "mysqladmin ping -h localhost -u root -pmagento || mariadb-admin ping -h localhost -u root -pmagento"
       interval: 5s
       timeout: 5s
       retries: 30

+ 2 - 0
compose/compose.yaml

@@ -41,6 +41,7 @@ services:
       --max_allowed_packet=64M
       --optimizer_use_condition_selectivity=1
       --optimizer_switch="rowid_filter=off"
+      --log_bin_trust_function_creators=1
     ports:
       - "3306:3306"
     env_file: env/db.env
@@ -53,6 +54,7 @@ services:
   #  image: mysql:8.4
   #  command:
   #    --max_allowed_packet=64M
+  #    --log_bin_trust_function_creators=1
   #  ports:
   #    - "3306:3306"
   #  env_file: env/db.env