From 6714d56979c2704b13983717b5344567810c144c Mon Sep 17 00:00:00 2001 From: Code-Egg Date: Mon, 4 Nov 2024 09:15:30 +0800 Subject: [PATCH] replaced mysql command with mariadb command because mariadb docker image doesnt ship with mysql anymore From https://github.com/litespeedtech/ols-docker-env/pull/86 --- bin/database.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/database.sh b/bin/database.sh index a40de61..96870ae 100755 --- a/bin/database.sh +++ b/bin/database.sh @@ -83,7 +83,7 @@ EOT } check_db_access(){ - docker compose exec -T mysql su -c "mysql -uroot -p${MYSQL_ROOT_PASSWORD} -e 'status'" >/dev/null 2>&1 + docker compose exec -T mysql su -c "mariadb -uroot --password=${MYSQL_ROOT_PASSWORD} -e 'status'" >/dev/null 2>&1 if [ ${?} != 0 ]; then echo '[X] DB access failed, please check!' exit 1 @@ -107,7 +107,7 @@ check_db_not_exist(){ } db_setup(){ - docker compose exec -T mysql su -c 'mysql -uroot -p${MYSQL_ROOT_PASSWORD} \ + docker compose exec -T mysql su -c 'mariadb -uroot --password=${MYSQL_ROOT_PASSWORD} \ -e "CREATE DATABASE '${SQL_DB}';" \ -e "GRANT ALL PRIVILEGES ON '${SQL_DB}'.* TO '${SQL_USER}'@'${ANY}' IDENTIFIED BY '${SQL_PASS}';" \ -e "FLUSH PRIVILEGES;"' @@ -123,7 +123,7 @@ db_delete(){ SQL_USER="${SQL_DB}" fi check_db_not_exist ${SQL_DB} - docker compose exec -T mysql su -c 'mysql -uroot -p${MYSQL_ROOT_PASSWORD} \ + docker compose exec -T mysql su -c 'mariadb -uroot --password=${MYSQL_ROOT_PASSWORD} \ -e "DROP DATABASE IF EXISTS '${SQL_DB}';" \ -e "DROP USER IF EXISTS '${SQL_USER}'@'${ANY}';" \ -e "FLUSH PRIVILEGES;"' @@ -190,4 +190,4 @@ while [ ! -z "${1}" ]; do esac shift done -main +main \ No newline at end of file