From 0b18a45163ff03921e163240fda94ec9c7e82c07 Mon Sep 17 00:00:00 2001
From: erikn69 <erikn_69@hotmail.com>
Date: Wed, 22 May 2024 12:45:52 -0500
Subject: [PATCH] fix mysql_native_password

---
 mysql/Dockerfile | 6 ++++++
 mysql/my.cnf     | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mysql/Dockerfile b/mysql/Dockerfile
index 0d5affa5..ca751265 100644
--- a/mysql/Dockerfile
+++ b/mysql/Dockerfile
@@ -15,4 +15,10 @@ COPY my.cnf /etc/mysql/conf.d/my.cnf
 
 RUN chmod 0444 /etc/mysql/conf.d/my.cnf
 
+RUN if [ ${MYSQL_VERSION} > '8.4.0-0.000' ]; then \
+  echo 'mysql_native_password=on' >> /etc/mysql/conf.d/my.cnf \
+else \
+  echo 'default-authentication-plugin=mysql_native_password' >> /etc/mysql/conf.d/my.cnf \
+;fi
+
 EXPOSE 3306
diff --git a/mysql/my.cnf b/mysql/my.cnf
index 57d38d74..211cd37e 100644
--- a/mysql/my.cnf
+++ b/mysql/my.cnf
@@ -8,5 +8,4 @@
 [mysqld]
 sql-mode="STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
 character-set-server=utf8
-default-authentication-plugin=mysql_native_password
 innodb_use_native_aio=0