From 3c0f6df9b33e162d83ea79aa5dd485d8da82bb31 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 17 Mar 2022 21:05:09 +0000 Subject: [PATCH] 10.6.7-debian-10-r26 release --- bitnami/mariadb-galera/10.6/debian-10/Dockerfile | 2 +- .../opt/bitnami/scripts/libmariadbgalera.sh | 16 ++++++++-------- .../opt/bitnami/scripts/mariadb-galera/setup.sh | 4 +++- bitnami/mariadb-galera/README.md | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/bitnami/mariadb-galera/10.6/debian-10/Dockerfile b/bitnami/mariadb-galera/10.6/debian-10/Dockerfile index a3ecdce5ff3f..a3f06bc7fe4d 100644 --- a/bitnami/mariadb-galera/10.6/debian-10/Dockerfile +++ b/bitnami/mariadb-galera/10.6/debian-10/Dockerfile @@ -20,7 +20,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb-galera/postunpack.sh ENV BITNAMI_APP_NAME="mariadb-galera" \ - BITNAMI_IMAGE_VERSION="10.6.7-debian-10-r25" \ + BITNAMI_IMAGE_VERSION="10.6.7-debian-10-r26" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" EXPOSE 3306 4444 4567 4568 diff --git a/bitnami/mariadb-galera/10.6/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh b/bitnami/mariadb-galera/10.6/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh index 8fefeaca7acb..9511713e95b7 100644 --- a/bitnami/mariadb-galera/10.6/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh +++ b/bitnami/mariadb-galera/10.6/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh @@ -624,18 +624,18 @@ mysql_copy_mounted_config() { } ######################## -# Run custom initialization scripts +# Run custom scripts # Globals: # DB_* # Arguments: -# None +# $1 - 'init' or 'start' ('init' runs on first container start, 'start' runs everytime the container starts) # Returns: # None ######################### -mysql_custom_init_scripts() { - if [[ -n $(find /docker-entrypoint-initdb.d/ -type f -regex ".*\.\(sh\|sql\|sql.gz\)") ]] && [[ ! -f "$DB_VOLUME_DIR/.user_scripts_initialized" ]] ; then - info "Loading user's custom files from /docker-entrypoint-initdb.d"; - for f in /docker-entrypoint-initdb.d/*; do +mysql_custom_scripts() { + if [[ -n $(find /docker-entrypoint-"$1"db.d/ -type f -regex ".*\.\(sh\|sql\|sql.gz\)") ]] && { [[ ! -f "$DB_VOLUME_DIR/.user_scripts_initialized" ]] || [[ $1 == 'start' ]]; } then + info "Loading user's custom files from /docker-entrypoint-$1db.d"; + for f in /docker-entrypoint-"$1"db.d/*; do case "$f" in *.sh) if [[ -x "$f" ]]; then @@ -650,7 +650,7 @@ mysql_custom_init_scripts() { wait_for_mysql_access "$DB_ROOT_USER" debug "Executing $f"; mysql_execute "$DB_DATABASE" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" < "$f" else - warn "Custom SQL initdb is not supported on non-primary nodes, ignoring $f" + warn "Custom SQL $1db is not supported on non-primary nodes, ignoring $f" fi ;; *.sql.gz) @@ -659,7 +659,7 @@ mysql_custom_init_scripts() { wait_for_mysql_access "$DB_ROOT_USER" debug "Executing $f"; gunzip -c "$f" | mysql_execute "$DB_DATABASE" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" else - warn "Custom SQL initdb is not supported on non-primary nodes, ignoring $f" + warn "Custom SQL $1db is not supported on non-primary nodes, ignoring $f" fi ;; *) diff --git a/bitnami/mariadb-galera/10.6/debian-10/rootfs/opt/bitnami/scripts/mariadb-galera/setup.sh b/bitnami/mariadb-galera/10.6/debian-10/rootfs/opt/bitnami/scripts/mariadb-galera/setup.sh index 5828846ee721..650dbb3f4ff0 100755 --- a/bitnami/mariadb-galera/10.6/debian-10/rootfs/opt/bitnami/scripts/mariadb-galera/setup.sh +++ b/bitnami/mariadb-galera/10.6/debian-10/rootfs/opt/bitnami/scripts/mariadb-galera/setup.sh @@ -38,7 +38,9 @@ mysql_initialize # Ensure LDAP is initialized is_boolean_yes "$DB_ENABLE_LDAP" && ldap_initialize # Allow running custom initialization scripts -mysql_custom_init_scripts +mysql_custom_scripts 'init' +# Allow running custom start scripts +mysql_custom_scripts 'start' # Stop MariaDB before flagging it as fully initialized. # Relying only on the trap defined above could produce a race condition. mysql_stop diff --git a/bitnami/mariadb-galera/README.md b/bitnami/mariadb-galera/README.md index 949d6aef4b62..1374b60951d1 100644 --- a/bitnami/mariadb-galera/README.md +++ b/bitnami/mariadb-galera/README.md @@ -53,7 +53,7 @@ Non-root container images add an extra layer of security and are generally recom Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`10.6`, `10.6-debian-10`, `10.6.7`, `10.6.7-debian-10-r25`, `latest` (10.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.6.7-debian-10-r25/10.6/debian-10/Dockerfile) +* [`10.6`, `10.6-debian-10`, `10.6.7`, `10.6.7-debian-10-r26`, `latest` (10.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.6.7-debian-10-r26/10.6/debian-10/Dockerfile) * [`10.5`, `10.5-debian-10`, `10.5.15`, `10.5.15-debian-10-r24` (10.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.5.15-debian-10-r24/10.5/debian-10/Dockerfile) * [`10.4`, `10.4-debian-10`, `10.4.24`, `10.4.24-debian-10-r26` (10.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.4.24-debian-10-r26/10.4/debian-10/Dockerfile) * [`10.3`, `10.3-debian-10`, `10.3.34`, `10.3.34-debian-10-r32` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.3.34-debian-10-r32/10.3/debian-10/Dockerfile)