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

fix: append user specified arguments while launching the mariadb server

Browse Source
This commit is contained in:
Sameer Naik
2015-07-15 21:27:00 +05:30
parent 557a69f8e0
commit 49abef4681
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
# MariaDB Utility functions
PROGRAM_OPTIONS="--defaults-file=$BITNAMI_APP_DIR/my.cnf --log-error=$BITNAMI_APP_DIR/logs/mysqld.log --basedir=$BITNAMI_APP_DIR --datadir=$BITNAMI_APP_DIR/data --plugin-dir=$BITNAMI_APP_DIR/lib/plugin --user=$BITNAMI_APP_USER --socket=$BITNAMI_APP_DIR/tmp/mysql.sock --lower-case-table-names=1 $EXTRA_OPTIONS"
PROGRAM_OPTIONS="--defaults-file=$BITNAMI_APP_DIR/my.cnf --log-error=$BITNAMI_APP_DIR/logs/mysqld.log --basedir=$BITNAMI_APP_DIR --datadir=$BITNAMI_APP_DIR/data --plugin-dir=$BITNAMI_APP_DIR/lib/plugin --user=$BITNAMI_APP_USER --socket=$BITNAMI_APP_DIR/tmp/mysql.sock --lower-case-table-names=1"
initialize_database() {
echo "==> Initializing MySQL database..."

5
bitnami/mariadb/entrypoint.sh
View File

@@ -8,6 +8,9 @@ print_welcome_page
if [ "${1:0:1}" = '-' ]; then
EXTRA_OPTIONS="$@"
set -- mysqld.bin
elif [ "${1}" == "mysqld.bin" -o "${1}" == "$BITNAMI_APP_DIR/bin/mysqld.bin" ]; then
EXTRA_OPTIONS="${@:2}"
set -- mysqld.bin
fi
if [ ! "$(ls -A $BITNAMI_APP_VOL_PREFIX/conf)" ]; then
@@ -15,7 +18,7 @@ if [ ! "$(ls -A $BITNAMI_APP_VOL_PREFIX/conf)" ]; then
fi
if [ "$1" = 'mysqld.bin' ]; then
set -- $@ $PROGRAM_OPTIONS
set -- $@ $PROGRAM_OPTIONS $EXTRA_OPTIONS
mkdir -p $BITNAMI_APP_DIR/tmp
chown -R $BITNAMI_APP_USER:$BITNAMI_APP_USER $BITNAMI_APP_DIR/tmp || true