v1.2.1 (#10)

Bug fixes
* Giving localhost permissions to specified user so healthcheck works correctly

Minor updates
* Using mariadb binaries
* Updating copyright year in healthcheck

Author: bfren

VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

overlay/etc/db/backup

@@ -17,7 +17,7 @@ THIS_BACKUP_PATH="${BACKUP_PATH}/${DATE}"
 #======================================================================================================================
 
 EXCLUDE="mysql|information_schema|performance_schema|sys"
-DATABASES=$(mysql -uroot -p${MARIADB_ROOT_PASSWORD} -e 'SHOW DATABASES;' | sed 1d | grep -v -E "(${EXCLUDE})")
+DATABASES=$(mariadb -uroot -p${MARIADB_ROOT_PASSWORD} -e 'SHOW DATABASES;' | sed 1d | grep -v -E "(${EXCLUDE})")
 [[ -z "${DATABASES}" ]] && _error "No databases found to backup."
 
 
@@ -35,7 +35,7 @@ for DATABASE in ${DATABASES} ; do
 
     # dump database and continue on failure
     _echo " - ${DATABASE}"
-    mysqldump --add-locks -uroot -p${MARIADB_ROOT_PASSWORD} ${DATABASE} > ${DUMP_FILE} || true
+    mariadb-dump --add-locks -uroot -p${MARIADB_ROOT_PASSWORD} ${DATABASE} > ${DUMP_FILE} || true
 
     # set read-only permissions
     chmod 440 ${DUMP_FILE}

overlay/etc/db/export

@@ -16,5 +16,5 @@ EXPORT_FILE="${BACKUP_PATH}/${1}.sql"
 #======================================================================================================================
 
 _echo "Exporting database '${1}' to ${EXPORT_FILE}..."
-mysqldump --add-locks -uroot -p${MARIADB_ROOT_PASSWORD} "${1}" > "${EXPORT_FILE}" || _error "Unable to export database '${1}'."
+mariadb-dump --add-locks -uroot -p${MARIADB_ROOT_PASSWORD} "${1}" > "${EXPORT_FILE}" || _error "Unable to export database '${1}'."
 _done

overlay/etc/services.d/mariadb/run

@@ -10,6 +10,7 @@
 
 create () {
     echo "CREATE DATABASE IF NOT EXISTS \`${2}\`;" >> ${1}
+    echo "GRANT ALL PRIVILEGES ON \`${2}\`.* TO '${3}'@'localhost' IDENTIFIED BY '${4}';" >> ${1}
     echo "GRANT ALL PRIVILEGES ON \`${2}\`.* TO '${3}'@'%' IDENTIFIED BY '${4}';" >> ${1}
 }
 

overlay/usr/local/bin/healthcheck

@@ -7,13 +7,13 @@ set -euo pipefail
 # Copyright (c) 2015 Thomas Boerger <https://webhippie.de>
 # Originally from https://github.com/dockhippie/mariadb/blob/master/latest/overlay/etc/s6/mariadb/run
 #
-# Modifications copyright (c) 2020 Ben Green <https://bcgdesign.com>
+# Modifications copyright (c) 2021 Ben Green <https://bcgdesign.com>
 #======================================================================================================================
 
 USERNAME=${MARIADB_USERNAME:-root}
 PASSWORD=${MARIADB_PASSWORD:-${MARIADB_ROOT_PASSWORD}}
 
-CHECK="$(echo 'SELECT 1;' | mysql -h127.0.0.1 -u${USERNAME} -p${PASSWORD} 2>/dev/null | head -n1)"
+CHECK="$(echo 'SELECT 1;' | mariadb -h127.0.0.1 -u${USERNAME} -p${PASSWORD} 2>/dev/null | head -n1)"
 
 [[ "${CHECK}" == "1" ]] && exit 0
 exit 1