Merge pull request #230 from Automattic/fix-mariadb-auth

fix(mariadb): handle authentication differences in Debian-based distros
Automattic · Jun 2, 2024 · d4f265d · d4f265d
2 parents 35e4559 + 95b51f8
commit d4f265d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/features/src/mariadb/devcontainer-feature.json b/features/src/mariadb/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
     "name": "MariaDB",
     "id": "mariadb",
-    "version": "1.1.4",
+    "version": "1.1.5",
     "description": "Sets up MariaDB into the Dev Environment",
     "options": {
         "installDatabaseToWorkspaces": {

diff --git a/features/src/mariadb/install.sh b/features/src/mariadb/install.sh
@@ -53,6 +53,10 @@ case "${ID_LIKE}" in
 
         if [ "${INSTALLDATABASETOWORKSPACES}" = 'true' ]; then
             mv /var/lib/mysql/debian-*.flag "${MARIADB_DATADIR}"
+        else
+            # The init script will recreate the database with the correct authentication method
+            rm -rf /var/lib/mysql/mysql
+            rm -f /var/lib/mysql/aria_log* /var/lib/mysql/ib*
         fi
     ;;
 

diff --git a/features/src/mariadb/service-run.tpl b/features/src/mariadb/service-run.tpl
@@ -3,11 +3,6 @@
 set -eu
 exec 2>&1
 
-if [ -f /etc/conf.d/mariadb ]; then
-    # shellcheck source=/dev/null
-    . /etc/conf.d/mariadb
-fi
-
 # shellcheck disable=SC2154
 install -d -D -m 02755 -o "${MARIADB_USER}" -g "${MARIADB_USER}" "${MARIADB_DATADIR}"
 chown -R "${MARIADB_USER}:${MARIADB_USER}" "${MARIADB_DATADIR}"