diff --git a/bitnami/mariadb/10.4/debian-11/Dockerfile b/bitnami/mariadb/10.4/debian-11/Dockerfile index fd4d464c0669..d09c0adc3afb 100644 --- a/bitnami/mariadb/10.4/debian-11/Dockerfile +++ b/bitnami/mariadb/10.4/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:53Z" \ + org.opencontainers.image.created="2023-03-15T18:00:41Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.4.28-debian-11-r11" \ + org.opencontainers.image.ref.name="10.4.28-debian-11-r12" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="10.4.28" diff --git a/bitnami/mariadb/10.4/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh b/bitnami/mariadb/10.4/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh index ad659fc32820..3368d8bb75f9 100644 --- a/bitnami/mariadb/10.4/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh +++ b/bitnami/mariadb/10.4/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") diff --git a/bitnami/mariadb/README.md b/bitnami/mariadb/README.md index facfffdc817a..09154508b88d 100644 --- a/bitnami/mariadb/README.md +++ b/bitnami/mariadb/README.md @@ -5,7 +5,6 @@ > MariaDB is an open source, community-developed SQL database server that is widely in use around the world due to its enterprise features, flexibility, and collaboration with leading tech firms. [Overview of MariaDB](https://mariadb.org/) - Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement. ## TL;DR