1berry/mariadb-docker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MySQL -> MariaDB, lets be accurate

Browse Source
This commit is contained in:
Daniel Black 2021-03-16 13:15:36 +11:00
parent bf06c07d56
commit a8d26b43f0
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
10.2/docker-entrypoint.sh
View File

@ -114,7 +114,7 @@ mysql_get_config() {
# match "datadir /some/path with/spaces in/it here" but not "--xyz=abc\n datadir (xyz)" # match "datadir /some/path with/spaces in/it here" but not "--xyz=abc\n datadir (xyz)"
} }
# Do a temporary startup of the MySQL server, for init purposes # Do a temporary startup of the MariaDB server, for init purposes
docker_temp_server_start() { docker_temp_server_start() {
"$@" --skip-networking --socket="${SOCKET}" & "$@" --skip-networking --socket="${SOCKET}" &
mysql_note "Waiting for server startup" mysql_note "Waiting for server startup"
@ -337,7 +337,7 @@ _main() {
# skip setup if they aren't running mysqld or want an option that stops mysqld # skip setup if they aren't running mysqld or want an option that stops mysqld
if [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then if [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then
mysql_note "Entrypoint script for MySQL Server ${MARIADB_VERSION} started." mysql_note "Entrypoint script for MariaDB Server ${MARIADB_VERSION} started."
mysql_check_config "$@" mysql_check_config "$@"
# Load various environment variables # Load various environment variables
@ -371,7 +371,7 @@ _main() {
mysql_note "Temporary server stopped" mysql_note "Temporary server stopped"
echo echo
mysql_note "MySQL init process done. Ready for start up." mysql_note "MariaDB init process done. Ready for start up."
echo echo
fi fi
fi fi

6
10.3/docker-entrypoint.sh
View File

@ -114,7 +114,7 @@ mysql_get_config() {
# match "datadir /some/path with/spaces in/it here" but not "--xyz=abc\n datadir (xyz)" # match "datadir /some/path with/spaces in/it here" but not "--xyz=abc\n datadir (xyz)"
} }
# Do a temporary startup of the MySQL server, for init purposes # Do a temporary startup of the MariaDB server, for init purposes
docker_temp_server_start() { docker_temp_server_start() {
"$@" --skip-networking --socket="${SOCKET}" & "$@" --skip-networking --socket="${SOCKET}" &
mysql_note "Waiting for server startup" mysql_note "Waiting for server startup"
@ -337,7 +337,7 @@ _main() {
# skip setup if they aren't running mysqld or want an option that stops mysqld # skip setup if they aren't running mysqld or want an option that stops mysqld
if [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then if [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then
mysql_note "Entrypoint script for MySQL Server ${MARIADB_VERSION} started." mysql_note "Entrypoint script for MariaDB Server ${MARIADB_VERSION} started."
mysql_check_config "$@" mysql_check_config "$@"
# Load various environment variables # Load various environment variables
@ -371,7 +371,7 @@ _main() {
mysql_note "Temporary server stopped" mysql_note "Temporary server stopped"
echo echo
mysql_note "MySQL init process done. Ready for start up." mysql_note "MariaDB init process done. Ready for start up."
echo echo
fi fi
fi fi

6
10.4/docker-entrypoint.sh
View File

@ -114,7 +114,7 @@ mysql_get_config() {
# match "datadir /some/path with/spaces in/it here" but not "--xyz=abc\n datadir (xyz)" # match "datadir /some/path with/spaces in/it here" but not "--xyz=abc\n datadir (xyz)"
} }
# Do a temporary startup of the MySQL server, for init purposes # Do a temporary startup of the MariaDB server, for init purposes
docker_temp_server_start() { docker_temp_server_start() {
"$@" --skip-networking --socket="${SOCKET}" & "$@" --skip-networking --socket="${SOCKET}" &
mysql_note "Waiting for server startup" mysql_note "Waiting for server startup"
@ -337,7 +337,7 @@ _main() {
# skip setup if they aren't running mysqld or want an option that stops mysqld # skip setup if they aren't running mysqld or want an option that stops mysqld
if [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then if [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then
mysql_note "Entrypoint script for MySQL Server ${MARIADB_VERSION} started." mysql_note "Entrypoint script for MariaDB Server ${MARIADB_VERSION} started."
mysql_check_config "$@" mysql_check_config "$@"
# Load various environment variables # Load various environment variables
@ -371,7 +371,7 @@ _main() {
mysql_note "Temporary server stopped" mysql_note "Temporary server stopped"
echo echo
mysql_note "MySQL init process done. Ready for start up." mysql_note "MariaDB init process done. Ready for start up."
echo echo
fi fi
fi fi

6
10.5/docker-entrypoint.sh
View File

@ -114,7 +114,7 @@ mysql_get_config() {
# match "datadir /some/path with/spaces in/it here" but not "--xyz=abc\n datadir (xyz)" # match "datadir /some/path with/spaces in/it here" but not "--xyz=abc\n datadir (xyz)"
} }
# Do a temporary startup of the MySQL server, for init purposes # Do a temporary startup of the MariaDB server, for init purposes
docker_temp_server_start() { docker_temp_server_start() {
"$@" --skip-networking --socket="${SOCKET}" & "$@" --skip-networking --socket="${SOCKET}" &
mysql_note "Waiting for server startup" mysql_note "Waiting for server startup"
@ -337,7 +337,7 @@ _main() {
# skip setup if they aren't running mysqld or want an option that stops mysqld # skip setup if they aren't running mysqld or want an option that stops mysqld
if [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then if [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then
mysql_note "Entrypoint script for MySQL Server ${MARIADB_VERSION} started." mysql_note "Entrypoint script for MariaDB Server ${MARIADB_VERSION} started."
mysql_check_config "$@" mysql_check_config "$@"
# Load various environment variables # Load various environment variables
@ -371,7 +371,7 @@ _main() {
mysql_note "Temporary server stopped" mysql_note "Temporary server stopped"
echo echo
mysql_note "MySQL init process done. Ready for start up." mysql_note "MariaDB init process done. Ready for start up."
echo echo
fi fi
fi fi

6
docker-entrypoint.sh
View File

@ -114,7 +114,7 @@ mysql_get_config() {
# match "datadir /some/path with/spaces in/it here" but not "--xyz=abc\n datadir (xyz)" # match "datadir /some/path with/spaces in/it here" but not "--xyz=abc\n datadir (xyz)"
} }
# Do a temporary startup of the MySQL server, for init purposes # Do a temporary startup of the MariaDB server, for init purposes
docker_temp_server_start() { docker_temp_server_start() {
"$@" --skip-networking --socket="${SOCKET}" & "$@" --skip-networking --socket="${SOCKET}" &
mysql_note "Waiting for server startup" mysql_note "Waiting for server startup"
@ -337,7 +337,7 @@ _main() {
# skip setup if they aren't running mysqld or want an option that stops mysqld # skip setup if they aren't running mysqld or want an option that stops mysqld
if [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then if [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then
mysql_note "Entrypoint script for MySQL Server ${MARIADB_VERSION} started." mysql_note "Entrypoint script for MariaDB Server ${MARIADB_VERSION} started."
mysql_check_config "$@" mysql_check_config "$@"
# Load various environment variables # Load various environment variables
@ -371,7 +371,7 @@ _main() {
mysql_note "Temporary server stopped" mysql_note "Temporary server stopped"
echo echo
mysql_note "MySQL init process done. Ready for start up." mysql_note "MariaDB init process done. Ready for start up."
echo echo
fi fi
fi fi