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

Switch to utility script and /usr/local/bitnami prefix

Browse Source
This commit is contained in:
Adnan Abdulhussein
2015-05-26 14:45:38 -07:00
parent 5b2b6b6e8e
commit c7e737fdf7
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bitnami/mariadb/entrypoint.sh
View File

@@ -9,11 +9,11 @@ fi
if [ ! "$(ls -A /conf)" ]; then
echo "Copying default configuration to /conf/my.cnf..."
echo ""
cp -r /opt/bitnami/mysql/conf.defaults/* /opt/bitnami/mysql/conf
cp -r /usr/local/bitnami/mysql/conf.defaults/* /usr/local/bitnami/mysql/conf
fi
if [ "$1" = 'mysqld.bin' ]; then
set -- "$@" --defaults-file=/opt/bitnami/mysql/my.cnf --log-error=/opt/bitnami/mysql/logs/mysqld.log --basedir=/opt/bitnami/mysql --datadir=/opt/bitnami/mysql/data --plugin-dir=/opt/bitnami/mysql/lib/plugin --user=mysql --socket=/opt/bitnami/mysql/tmp/mysql.sock "--lower-case-table-names=1" $EXTRA_OPTIONS
set -- "$@" --defaults-file=/usr/local/bitnami/mysql/my.cnf --log-error=/usr/local/bitnami/mysql/logs/mysqld.log --basedir=/usr/local/bitnami/mysql --datadir=/usr/local/bitnami/mysql/data --plugin-dir=/usr/local/bitnami/mysql/lib/plugin --user=mysql --socket=/usr/local/bitnami/mysql/tmp/mysql.sock "--lower-case-table-names=1" $EXTRA_OPTIONS
if [ ! "$(ls -A /data)" ]; then
if [ -z "$MYSQL_PASSWORD" ]; then
@@ -29,8 +29,8 @@ if [ "$1" = 'mysqld.bin' ]; then
echo "Initializing MySQL database..."
echo ""
/opt/bitnami/mysql/scripts/mysql_install_db --port=3306 --socket=/opt/bitnami/mysql/tmp/mysql.sock --basedir=/opt/bitnami/mysql --datadir=/opt/bitnami/mysql/data > /dev/null
chown -R mysql:mysql /opt/bitnami/mysql/data
/usr/local/bitnami/mysql/scripts/mysql_install_db --port=3306 --socket=/usr/local/bitnami/mysql/tmp/mysql.sock --basedir=/usr/local/bitnami/mysql --datadir=/usr/local/bitnami/mysql/data > /dev/null
chown -R mysql:mysql /usr/local/bitnami/mysql/data
echo "UPDATE mysql.user SET Password=PASSWORD('$MYSQL_PASSWORD') WHERE User='root';" >> /tmp/init_mysql.sql
echo "FLUSH PRIVILEGES;" >> /tmp/init_mysql.sql
@@ -43,7 +43,7 @@ if [ "$1" = 'mysqld.bin' ]; then
set -- "$@" --init-file=/tmp/init_mysql.sql
fi
chown -R mysql:mysql /opt/bitnami/mysql/logs
chown -R mysql:mysql /usr/local/bitnami/mysql/logs
fi
exec "$@"