From 20b1413b646df9a45df2d4dcc5c5c89ecb42c0b1 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Fri, 18 May 2018 13:06:01 -0700 Subject: [PATCH] Pass extra mysqld flags to mysql_install_db --- 10.0/docker-entrypoint.sh | 3 ++- 10.1/docker-entrypoint.sh | 3 ++- 10.2/docker-entrypoint.sh | 3 ++- 10.3/docker-entrypoint.sh | 3 ++- 5.5/docker-entrypoint.sh | 3 ++- docker-entrypoint.sh | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/10.0/docker-entrypoint.sh b/10.0/docker-entrypoint.sh index b87f9ee3..98a6e66d 100755 --- a/10.0/docker-entrypoint.sh +++ b/10.0/docker-entrypoint.sh @@ -88,7 +88,8 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then mkdir -p "$DATADIR" echo 'Initializing database' - mysql_install_db --datadir="$DATADIR" --rpm + # "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here) + mysql_install_db --datadir="$DATADIR" --rpm "${@:2}" echo 'Database initialized' SOCKET="$(_get_config 'socket' "$@")" diff --git a/10.1/docker-entrypoint.sh b/10.1/docker-entrypoint.sh index b87f9ee3..98a6e66d 100755 --- a/10.1/docker-entrypoint.sh +++ b/10.1/docker-entrypoint.sh @@ -88,7 +88,8 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then mkdir -p "$DATADIR" echo 'Initializing database' - mysql_install_db --datadir="$DATADIR" --rpm + # "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here) + mysql_install_db --datadir="$DATADIR" --rpm "${@:2}" echo 'Database initialized' SOCKET="$(_get_config 'socket' "$@")" diff --git a/10.2/docker-entrypoint.sh b/10.2/docker-entrypoint.sh index b87f9ee3..98a6e66d 100755 --- a/10.2/docker-entrypoint.sh +++ b/10.2/docker-entrypoint.sh @@ -88,7 +88,8 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then mkdir -p "$DATADIR" echo 'Initializing database' - mysql_install_db --datadir="$DATADIR" --rpm + # "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here) + mysql_install_db --datadir="$DATADIR" --rpm "${@:2}" echo 'Database initialized' SOCKET="$(_get_config 'socket' "$@")" diff --git a/10.3/docker-entrypoint.sh b/10.3/docker-entrypoint.sh index b87f9ee3..98a6e66d 100755 --- a/10.3/docker-entrypoint.sh +++ b/10.3/docker-entrypoint.sh @@ -88,7 +88,8 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then mkdir -p "$DATADIR" echo 'Initializing database' - mysql_install_db --datadir="$DATADIR" --rpm + # "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here) + mysql_install_db --datadir="$DATADIR" --rpm "${@:2}" echo 'Database initialized' SOCKET="$(_get_config 'socket' "$@")" diff --git a/5.5/docker-entrypoint.sh b/5.5/docker-entrypoint.sh index b87f9ee3..98a6e66d 100755 --- a/5.5/docker-entrypoint.sh +++ b/5.5/docker-entrypoint.sh @@ -88,7 +88,8 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then mkdir -p "$DATADIR" echo 'Initializing database' - mysql_install_db --datadir="$DATADIR" --rpm + # "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here) + mysql_install_db --datadir="$DATADIR" --rpm "${@:2}" echo 'Database initialized' SOCKET="$(_get_config 'socket' "$@")" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index b87f9ee3..98a6e66d 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -88,7 +88,8 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then mkdir -p "$DATADIR" echo 'Initializing database' - mysql_install_db --datadir="$DATADIR" --rpm + # "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here) + mysql_install_db --datadir="$DATADIR" --rpm "${@:2}" echo 'Database initialized' SOCKET="$(_get_config 'socket' "$@")"