Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-21 15:29:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renaming MYSQL to MARIADB, Refs T3975, T3790

Browse Source
This commit is contained in:
Miguel Martinez
2015-06-09 15:35:46 -07:00
parent 819921c23b
commit 57844c5162
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
bitnami/mariadb/bitnami-utils-custom.sh
View File

@@ -9,52 +9,53 @@ initialize_database() {
} }
create_custom_database() { create_custom_database() {
if [ "$MYSQL_DATABASE" ]; then if [ "$MARIADB_DATABASE" ]; then
echo "==> Creating database $MYSQL_DATABASE..." echo "==> Creating database $MARIADB_DATABASE..."
echo "" echo ""
echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\`;" >> /tmp/init_mysql.sql echo "CREATE DATABASE IF NOT EXISTS \`$MARIADB_DATABASE\`;" >> /tmp/init_mysql.sql
fi fi
} }
create_mysql_user() { create_mysql_user() {
if [ ! "$MYSQL_USER" ]; then if [ ! "$MARIADB_USER" ]; then
MYSQL_USER=root MARIADB_USER=root
fi fi
if [ "$MYSQL_USER" != "root" ] && [ ! $MYSQL_DATABASE ]; then if [ "$MARIADB_USER" != "root" ] && [ ! $MARIADB_DATABASE ]; then
echo "In order to use a custom MYSQL_USER you need to provide the MYSQL_DATABASE as well" echo "In order to use a custom MARIADB_USER you need to provide the MARIADB_DATABASE as well"
echo "" echo ""
exit -1 exit -1
fi fi
echo "==> Creating user $MYSQL_USER..." echo "==> Creating user $MARIADB_USER..."
echo "" echo ""
echo "DELETE FROM mysql.user ;" >> /tmp/init_mysql.sql echo "DELETE FROM mysql.user ;" >> /tmp/init_mysql.sql
echo "CREATE USER '${MYSQL_USER}'@'%' IDENTIFIED BY '${MYSQL_PASSWORD}' ;" >> /tmp/init_mysql.sql echo "CREATE USER '${MARIADB_USER}'@'%' IDENTIFIED BY '${MARIADB_PASSWORD}' ;" >> /tmp/init_mysql.sql
if [ "$MYSQL_USER" = root ]; then if [ "$MARIADB_USER" = root ]; then
echo "==> Creating root user with unrestricted access..." echo "==> Creating root user with unrestricted access..."
echo "GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION ;" >> /tmp/init_mysql.sql echo "GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION ;" >> /tmp/init_mysql.sql
else else
echo "==> Granting acces to $MYSQL_USER to the database $MYSQL_DATABASE..." echo "==> Granting acces to $MARIADB_USER to the database $MARIADB_DATABASE..."
echo "" echo ""
echo "GRANT ALL ON \`${MYSQL_DATABASE}\`.* TO \`${MYSQL_USER}\`@'%' ;" >> /tmp/init_mysql.sql echo "GRANT ALL ON \`${MARIADB_DATABASE}\`.* TO \`${MARIADB_USER}\`@'%' ;" >> /tmp/init_mysql.sql
fi fi
echo "FLUSH PRIVILEGES ;" >> /tmp/init_mysql.sql echo "FLUSH PRIVILEGES ;" >> /tmp/init_mysql.sql
echo "DROP DATABASE IF EXISTS test ; " >> /tmp/init_mysql.sql
} }
print_mysql_password() { print_mysql_password() {
if [ -z $MYSQL_PASSWORD ]; then if [ -z $MARIADB_PASSWORD ]; then
echo "**none**" echo "**none**"
else else
echo $MYSQL_PASSWORD echo $MARIADB_PASSWORD
fi fi
} }
print_mysql_database() { print_mysql_database() {
if [ $MYSQL_DATABASE ]; then if [ $MARIADB_DATABASE ]; then
echo "Database: $MYSQL_DATABASE" echo "Database: $MARIADB_DATABASE"
fi fi
} }

2
bitnami/mariadb/entrypoint.sh
View File

@@ -28,7 +28,7 @@ if [ "$1" = 'mysqld.bin' ]; then
create_mysql_user create_mysql_user
print_app_credentials $BITNAMI_APP_NAME $MYSQL_USER `print_mysql_password` `print_mysql_database` print_app_credentials $BITNAMI_APP_NAME $MARIADB_USER `print_mysql_password` `print_mysql_database`
else else
print_container_already_initialized $BITNAMI_APP_NAME print_container_already_initialized $BITNAMI_APP_NAME
fi fi