From 40f4af671dad80ddc579baba8fc3a6c252e3214d Mon Sep 17 00:00:00 2001 From: Simon <10352679+simonhammes@users.noreply.github.com> Date: Fri, 23 Aug 2024 09:08:41 +0200 Subject: [PATCH] [bitnami/mariadb-galera] Fix healthcheck if MARIADB_ROOT_USER != root (#71156) Signed-off-by: simonhammes Co-authored-by: simonhammes --- .../debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh | 4 ++-- .../debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh | 4 ++-- .../debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh | 4 ++-- .../debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh | 4 ++-- .../debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh | 4 ++-- .../debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh | 4 ++-- .../debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bitnami/mariadb-galera/10.11/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh b/bitnami/mariadb-galera/10.11/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh index d954f749f24e..b320d52c003f 100644 --- a/bitnami/mariadb-galera/10.11/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh +++ b/bitnami/mariadb-galera/10.11/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh @@ -2134,14 +2134,14 @@ find_jemalloc_lib() { ######################## # Execute a reliable health check against the current mysql instance # Globals: -# DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD +# DB_ROOT_USER, DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD # Arguments: # None # Returns: # mysqladmin output ######################### mysql_healthcheck() { - local args=("-uroot" "-h0.0.0.0") + local args=("-u${DB_ROOT_USER}" "-h0.0.0.0") local root_password root_password="$(get_master_env_var_value ROOT_PASSWORD)" diff --git a/bitnami/mariadb-galera/10.4/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh b/bitnami/mariadb-galera/10.4/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh index d954f749f24e..b320d52c003f 100644 --- a/bitnami/mariadb-galera/10.4/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh +++ b/bitnami/mariadb-galera/10.4/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh @@ -2134,14 +2134,14 @@ find_jemalloc_lib() { ######################## # Execute a reliable health check against the current mysql instance # Globals: -# DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD +# DB_ROOT_USER, DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD # Arguments: # None # Returns: # mysqladmin output ######################### mysql_healthcheck() { - local args=("-uroot" "-h0.0.0.0") + local args=("-u${DB_ROOT_USER}" "-h0.0.0.0") local root_password root_password="$(get_master_env_var_value ROOT_PASSWORD)" diff --git a/bitnami/mariadb-galera/10.5/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh b/bitnami/mariadb-galera/10.5/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh index d954f749f24e..b320d52c003f 100644 --- a/bitnami/mariadb-galera/10.5/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh +++ b/bitnami/mariadb-galera/10.5/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh @@ -2134,14 +2134,14 @@ find_jemalloc_lib() { ######################## # Execute a reliable health check against the current mysql instance # Globals: -# DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD +# DB_ROOT_USER, DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD # Arguments: # None # Returns: # mysqladmin output ######################### mysql_healthcheck() { - local args=("-uroot" "-h0.0.0.0") + local args=("-u${DB_ROOT_USER}" "-h0.0.0.0") local root_password root_password="$(get_master_env_var_value ROOT_PASSWORD)" diff --git a/bitnami/mariadb-galera/10.6/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh b/bitnami/mariadb-galera/10.6/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh index d954f749f24e..b320d52c003f 100644 --- a/bitnami/mariadb-galera/10.6/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh +++ b/bitnami/mariadb-galera/10.6/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh @@ -2134,14 +2134,14 @@ find_jemalloc_lib() { ######################## # Execute a reliable health check against the current mysql instance # Globals: -# DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD +# DB_ROOT_USER, DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD # Arguments: # None # Returns: # mysqladmin output ######################### mysql_healthcheck() { - local args=("-uroot" "-h0.0.0.0") + local args=("-u${DB_ROOT_USER}" "-h0.0.0.0") local root_password root_password="$(get_master_env_var_value ROOT_PASSWORD)" diff --git a/bitnami/mariadb-galera/11.1/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh b/bitnami/mariadb-galera/11.1/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh index d954f749f24e..b320d52c003f 100644 --- a/bitnami/mariadb-galera/11.1/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh +++ b/bitnami/mariadb-galera/11.1/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh @@ -2134,14 +2134,14 @@ find_jemalloc_lib() { ######################## # Execute a reliable health check against the current mysql instance # Globals: -# DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD +# DB_ROOT_USER, DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD # Arguments: # None # Returns: # mysqladmin output ######################### mysql_healthcheck() { - local args=("-uroot" "-h0.0.0.0") + local args=("-u${DB_ROOT_USER}" "-h0.0.0.0") local root_password root_password="$(get_master_env_var_value ROOT_PASSWORD)" diff --git a/bitnami/mariadb-galera/11.2/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh b/bitnami/mariadb-galera/11.2/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh index d954f749f24e..b320d52c003f 100644 --- a/bitnami/mariadb-galera/11.2/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh +++ b/bitnami/mariadb-galera/11.2/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh @@ -2134,14 +2134,14 @@ find_jemalloc_lib() { ######################## # Execute a reliable health check against the current mysql instance # Globals: -# DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD +# DB_ROOT_USER, DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD # Arguments: # None # Returns: # mysqladmin output ######################### mysql_healthcheck() { - local args=("-uroot" "-h0.0.0.0") + local args=("-u${DB_ROOT_USER}" "-h0.0.0.0") local root_password root_password="$(get_master_env_var_value ROOT_PASSWORD)" diff --git a/bitnami/mariadb-galera/11.4/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh b/bitnami/mariadb-galera/11.4/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh index d954f749f24e..b320d52c003f 100644 --- a/bitnami/mariadb-galera/11.4/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh +++ b/bitnami/mariadb-galera/11.4/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh @@ -2134,14 +2134,14 @@ find_jemalloc_lib() { ######################## # Execute a reliable health check against the current mysql instance # Globals: -# DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD +# DB_ROOT_USER, DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD # Arguments: # None # Returns: # mysqladmin output ######################### mysql_healthcheck() { - local args=("-uroot" "-h0.0.0.0") + local args=("-u${DB_ROOT_USER}" "-h0.0.0.0") local root_password root_password="$(get_master_env_var_value ROOT_PASSWORD)"