10h30/ols-docker-env
1
0
Fork 0
mirror of https://github.com/10h30/ols-docker-env.git synced 2026-05-12 15:21:24 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87 from litespeedtech/revert-86-master

Browse Source 
Revert "Update database.sh"
This commit is contained in:
E.L.
2024-10-25 13:50:26 +08:00
committed by GitHub
parent 27c364ca1b e2f3df1867
commit ab5bb0f44b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/database.sh
+3 -3
View File
@@ -83,7 +83,7 @@ EOT
} }
check_db_access(){ check_db_access(){
docker compose exec -T mysql su -c "mariadb -uroot --password=${MYSQL_ROOT_PASSWORD} -e 'status'" >/dev/null 2>&1 docker compose exec -T mysql su -c "mysql -uroot -p${MYSQL_ROOT_PASSWORD} -e 'status'" >/dev/null 2>&1
if [ ${?} != 0 ]; then if [ ${?} != 0 ]; then
echo '[X] DB access failed, please check!' echo '[X] DB access failed, please check!'
exit 1 exit 1
@@ -107,7 +107,7 @@ check_db_not_exist(){
} }
db_setup(){ db_setup(){
docker compose exec -T mysql su -c 'mariadb -uroot --password=${MYSQL_ROOT_PASSWORD} \ docker compose exec -T mysql su -c 'mysql -uroot -p${MYSQL_ROOT_PASSWORD} \
-e "CREATE DATABASE '${SQL_DB}';" \ -e "CREATE DATABASE '${SQL_DB}';" \
-e "GRANT ALL PRIVILEGES ON '${SQL_DB}'.* TO '${SQL_USER}'@'${ANY}' IDENTIFIED BY '${SQL_PASS}';" \ -e "GRANT ALL PRIVILEGES ON '${SQL_DB}'.* TO '${SQL_USER}'@'${ANY}' IDENTIFIED BY '${SQL_PASS}';" \
-e "FLUSH PRIVILEGES;"' -e "FLUSH PRIVILEGES;"'
@@ -123,7 +123,7 @@ db_delete(){
SQL_USER="${SQL_DB}" SQL_USER="${SQL_DB}"
fi fi
check_db_not_exist ${SQL_DB} check_db_not_exist ${SQL_DB}
docker compose exec -T mysql su -c 'mariadb -uroot --password=${MYSQL_ROOT_PASSWORD} \ docker compose exec -T mysql su -c 'mysql -uroot -p${MYSQL_ROOT_PASSWORD} \
-e "DROP DATABASE IF EXISTS '${SQL_DB}';" \ -e "DROP DATABASE IF EXISTS '${SQL_DB}';" \
-e "DROP USER IF EXISTS '${SQL_USER}'@'${ANY}';" \ -e "DROP USER IF EXISTS '${SQL_USER}'@'${ANY}';" \
-e "FLUSH PRIVILEGES;"' -e "FLUSH PRIVILEGES;"'