Move upgrade to post svc init

Author: nemchik

root/etc/s6-overlay/s6-rc.d/init-mariadb-initdb/run

@@ -13,16 +13,6 @@ start_mariadb() {
     done
 }
 
-# make temp sql init file
-tempSqlFile=$(mktemp)
-
-# test for empty password variable, if it's set to 0 or less than 4 characters
-if [[ -z "${MYSQL_ROOT_PASSWORD}" ]]; then
-    TEST_LEN="0"
-else
-    TEST_LEN=${#MYSQL_ROOT_PASSWORD}
-fi
-
 # test for existence of mysql folder in datadir and start initialise if not present
 if [[ ! -d "${DATADIR}/mysql" ]]; then
     # load env file if it exists
@@ -31,11 +21,21 @@ if [[ ! -d "${DATADIR}/mysql" ]]; then
         source /config/env
     fi
 
+    # make temp sql init file
+    tempSqlFile=$(mktemp)
+
     # set basic sql command
     cat >"${tempSqlFile}" <<-EOSQL
 DELETE FROM mysql.user WHERE user <> 'mariadb.sys';
 EOSQL
 
+    # test for empty password variable, if it's set to 0 or less than 4 characters
+    if [[ -z "${MYSQL_ROOT_PASSWORD}" ]]; then
+        TEST_LEN="0"
+    else
+        TEST_LEN=${#MYSQL_ROOT_PASSWORD}
+    fi
+
     if [[ "${TEST_LEN}" -lt "4" ]]; then
         MYSQL_PASS="CREATE USER 'root'@'%' IDENTIFIED BY '' ;"
     else
@@ -115,44 +115,11 @@ EOFPASS
 
         sleep 5s
     fi
-else
-    if [[ "${TEST_LEN}" -lt "4" ]]; then
-        echo "MYSQL_ROOT_PASSWORD is not set or too short, skipping upgrade check"
-    else
-        # set some permissions needed before we begin
-        lsiown -R abc:abc "${tempSqlFile}"
-
-        # start mariadb
-        start_mariadb
-
-        # display a message about upgrading database if needed
-        if mariadb-upgrade -u root -p"${MYSQL_ROOT_PASSWORD}" --check-if-upgrade-is-needed >/dev/null 2>&1; then
-            cat <<-EOFPASS
-
 
-
-#################################################################
-#   An upgrade is required on your databases. Run the command   #
-#             mariadb-upgrade -u root -p<PASSWORD>              #
-#################################################################
-
-
-
-EOFPASS
-
-            sleep 5s
-        fi
-
-        # shut down after apply sql commands, waiting for pid to stop
-        mariadb-admin -u root shutdown
-        wait "${pid}"
-        echo "Database Upgrade Check Completed"
-    fi
+    # clean up any old install files from /tmp
+    rm -f "${tempSqlFile}"
 fi
 
-# clean up any old install files from /tmp
-rm -f "${tempSqlFile}"
-
 # own the folder the pid for mysql runs in
 lsiown -R abc:abc /var/run/mysqld
 lsiown -R abc:abc /config

root/etc/s6-overlay/s6-rc.d/init-mariadb-upgrade/dependencies.d/svc-mariadb

@@ -0,0 +1,19 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+# display a message about upgrading database if needed
+if mariadb-upgrade -u root -p"${MYSQL_ROOT_PASSWORD}" --check-if-upgrade-is-needed >/dev/null 2>&1; then
+    cat <<-EOF
+
+
+
+#################################################################
+#   An upgrade is required on your databases. Run the command   #
+#             mariadb-upgrade -u root -p<PASSWORD>              #
+#################################################################
+
+
+
+EOF
+    sleep 5s
+fi

root/etc/s6-overlay/s6-rc.d/init-mariadb-upgrade/run

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-mariadb-upgrade/type

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mariadb-upgrade/run