Skip to content

Commit 6714d56

Browse files
committed
replaced mysql command with mariadb command because mariadb docker image doesnt ship with mysql anymore
From #86
1 parent 84f1235 commit 6714d56

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

bin/database.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ EOT
8383
}
8484

8585
check_db_access(){
86-
docker compose exec -T mysql su -c "mysql -uroot -p${MYSQL_ROOT_PASSWORD} -e 'status'" >/dev/null 2>&1
86+
docker compose exec -T mysql su -c "mariadb -uroot --password=${MYSQL_ROOT_PASSWORD} -e 'status'" >/dev/null 2>&1
8787
if [ ${?} != 0 ]; then
8888
echo '[X] DB access failed, please check!'
8989
exit 1
@@ -107,7 +107,7 @@ check_db_not_exist(){
107107
}
108108

109109
db_setup(){
110-
docker compose exec -T mysql su -c 'mysql -uroot -p${MYSQL_ROOT_PASSWORD} \
110+
docker compose exec -T mysql su -c 'mariadb -uroot --password=${MYSQL_ROOT_PASSWORD} \
111111
-e "CREATE DATABASE '${SQL_DB}';" \
112112
-e "GRANT ALL PRIVILEGES ON '${SQL_DB}'.* TO '${SQL_USER}'@'${ANY}' IDENTIFIED BY '${SQL_PASS}';" \
113113
-e "FLUSH PRIVILEGES;"'
@@ -123,7 +123,7 @@ db_delete(){
123123
SQL_USER="${SQL_DB}"
124124
fi
125125
check_db_not_exist ${SQL_DB}
126-
docker compose exec -T mysql su -c 'mysql -uroot -p${MYSQL_ROOT_PASSWORD} \
126+
docker compose exec -T mysql su -c 'mariadb -uroot --password=${MYSQL_ROOT_PASSWORD} \
127127
-e "DROP DATABASE IF EXISTS '${SQL_DB}';" \
128128
-e "DROP USER IF EXISTS '${SQL_USER}'@'${ANY}';" \
129129
-e "FLUSH PRIVILEGES;"'
@@ -190,4 +190,4 @@ while [ ! -z "${1}" ]; do
190190
esac
191191
shift
192192
done
193-
main
193+
main

0 commit comments

Comments
 (0)