From c3154bca0b9b0cdeb887e5db77fff6b43ed6824d3be45b9372457adb901a3821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Sun, 19 May 2024 09:06:50 +0000 Subject: [PATCH] [info=28d0c45a528bcf2673ca492be88e76da] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/mariadb-image?expand=0&rev=52 --- docker-entrypoint.sh | 12 +++++++++++- mariadb-image.changes | 5 +++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 3588098..53ca04c 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -228,7 +228,17 @@ docker_init_database_dir() { mysql_note "Initializing database files" installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal ) # "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here) - mysql_install_db "${installArgs[@]}" "${@:2}" \ + + local mariadbdArgs=() + for arg in "${@:2}"; do + # Check if the argument contains whitespace + if [[ "$arg" =~ [[:space:]] ]]; then + mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace." + else + mariadbdArgs+=("$arg") + fi + done + mysql_install_db "${installArgs[@]}" "${mariadbdArgs[@]}" \ --skip-test-db \ --old-mode='UTF8_IS_UTF8MB3' \ --default-time-zone=SYSTEM --enforce-storage-engine= \ diff --git a/mariadb-image.changes b/mariadb-image.changes index 52104fd..6daed77 100644 --- a/mariadb-image.changes +++ b/mariadb-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat May 18 17:56:27 UTC 2024 - Dan Čermák + +- Handle arguments with spaces in mysql_install_db + ------------------------------------------------------------------- Thu May 16 16:20:25 UTC 2024 - Dan Čermák