From d8726aa6afec7c07d502732fde972945842b9a49 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 15 Mar 2023 19:36:39 +0100 Subject: [PATCH] [bitnami/mariadb] Release 10.3.38-debian-11-r12 (#27487) Signed-off-by: Bitnami Containers --- bitnami/mariadb/10.3/debian-11/Dockerfile | 4 ++-- .../10.3/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bitnami/mariadb/10.3/debian-11/Dockerfile b/bitnami/mariadb/10.3/debian-11/Dockerfile index 1ef07c14a4d4..a23b6b9aee37 100644 --- a/bitnami/mariadb/10.3/debian-11/Dockerfile +++ b/bitnami/mariadb/10.3/debian-11/Dockerfile @@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-03-12T16:06:12Z" \ + org.opencontainers.image.created="2023-03-15T18:08:26Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.3.38-debian-11-r11" \ + org.opencontainers.image.ref.name="10.3.38-debian-11-r12" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="10.3.38" diff --git a/bitnami/mariadb/10.3/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh b/bitnami/mariadb/10.3/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh index ad659fc32820..3368d8bb75f9 100644 --- a/bitnami/mariadb/10.3/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh +++ b/bitnami/mariadb/10.3/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh @@ -723,6 +723,11 @@ mysql_stop() { mysql_install_db() { local command="${DB_BIN_DIR}/mysql_install_db" local -a args=("--defaults-file=${DB_CONF_FILE}" "--basedir=${DB_BASE_DIR}" "--datadir=${DB_DATA_DIR}") + + # Add flags specified via the 'DB_EXTRA_FLAGS' environment variable + read -r -a db_extra_flags <<< "$(mysql_extra_flags)" + [[ "${#db_extra_flags[@]}" -gt 0 ]] && args+=("${db_extra_flags[@]}") + am_i_root && args=("${args[@]}" "--user=$DB_DAEMON_USER") if [[ "$DB_FLAVOR" = "mariadb" ]]; then args+=("--auth-root-authentication-method=normal")