10.3.29-debian-10-r27 release

2026-03-25 15:27:42 +08:00 · 2021-06-07 22:10:22 +00:00
parent 41ecae0ad6
commit 32dbcc4fbf
5 changed files with 65 additions and 18 deletions
--- a/bitnami/mariadb-galera/10.3/debian-10/Dockerfile
+++ b/bitnami/mariadb-galera/10.3/debian-10/Dockerfile
@@ -11,14 +11,14 @@ COPY prebuildfs /
 RUN install_packages acl ca-certificates curl gzip iproute2 ldap-utils libaio1 libaudit1 libc6 libcap-ng0 libgcc1 libicu63 libjemalloc2 liblzma5 libncurses6 libnss-ldapd libpam-ldapd libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 lsof nslcd procps rsync socat tar zlib1g
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ini-file" "1.3.0-2" --checksum d89528e5d733f34ae030984584659ff10a36370d40332bd8d41c047764d39cda
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mariadb-galera" "10.3.29-0" --checksum 7646ce3c0134b7bd3ee6651248f8ebe1ec54f3714655b77adda441c783008aef
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2" --checksum 4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.13.0-0" --checksum fd7257c2736164d02832dbf72e2c1ed9d875bf3e32f0988520796bc503330129
 RUN chmod g+rwX /opt/bitnami
 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.3.29-debian-10-r26" \
+    BITNAMI_IMAGE_VERSION="10.3.29-debian-10-r27" \
    PATH="/opt/bitnami/common/bin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH"

 EXPOSE 3306 4444 4567 4568
--- a/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,10 +1,10 @@
 {
    "gosu": {
        "arch": "amd64",
-        "digest": "4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50",
+        "digest": "fd7257c2736164d02832dbf72e2c1ed9d875bf3e32f0988520796bc503330129",
        "distro": "debian-10",
        "type": "NAMI",
-        "version": "1.12.0-2"
+        "version": "1.13.0-0"
    },
    "ini-file": {
        "arch": "amd64",
--- a/bitnami/mariadb-galera/10.3/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
+++ b/bitnami/mariadb-galera/10.3/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
@@ -331,6 +331,30 @@ plugin_load_add = auth_pam
 EOF
 }

+########################
+# Update MySQL/MariaDB Galera-specific ssl configuration with user custom inputs
+# Globals:
+#   DB_*
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+mysql_galera_configure_ssl() {
+    if is_boolean_yes "$DB_ENABLE_TLS" && ! grep -q "socket.ssl_cert=" "$DB_TLS_CERT_FILE"; then
+        info "Setting ENABLE_TLS"
+        cat >> "$DB_CONF_FILE" <<EOF
+ssl_cert=${DB_TLS_CERT_FILE}
+ssl_key=${DB_TLS_KEY_FILE}
+ssl_ca=${DB_TLS_CA_FILE}
+wsrep_provider_options="socket.ssl_cert=${DB_TLS_CERT_FILE};socket.ssl_key=${DB_TLS_KEY_FILE};socket.ssl_ca=${DB_TLS_CA_FILE}"
+EOF
+    fi
+
+    # Avoid exit code of previous commands to affect the result of this function
+    true
+}
+
 ########################
 # Update MySQL/MariaDB Galera-specific configuration file with user custom inputs
 # Globals:
@@ -361,16 +385,6 @@ mysql_galera_update_custom_config() {
    local default_auth_string="${DB_GALERA_DEFAULT_MARIABACKUP_USER}:${DB_GALERA_DEFAULT_MARIABACKUP_PASSWORD}"
    [[ "$galera_auth_string" != "$default_auth_string" ]] && mysql_conf_set "wsrep_sst_auth" "$galera_auth_string" "galera"

-    if is_boolean_yes "$DB_ENABLE_TLS" && ! grep -q "socket.ssl_cert=" "$DB_TLS_CERT_FILE"; then
-        info "Setting ENABLE_TLS"
-        cat >> "$DB_CONF_FILE" <<EOF
-ssl_cert=${DB_TLS_CERT_FILE}
-ssl_key=${DB_TLS_KEY_FILE}
-ssl_ca=${DB_TLS_CA_FILE}
-wsrep_provider_options="socket.ssl_cert=${DB_TLS_CERT_FILE};socket.ssl_key=${DB_TLS_KEY_FILE};socket.ssl_ca=${DB_TLS_CA_FILE}"
-EOF
-    fi
-
    # Avoid exit code of previous commands to affect the result of this function
    true
 }
@@ -478,6 +492,8 @@ mysql_initialize() {
    # Exec replaces the process without creating a new one, and when the container is restarted it may have the same PID
    rm -f "$DB_PID_FILE"

+    mysql_copy_mounted_config
+
    debug "Ensuring expected directories/files exist"
    for dir in "$DB_DATA_DIR" "$DB_TMP_DIR" "$DB_LOGS_DIR" "$DB_GALERA_BOOTSTRAP_DIR"; do
        ensure_dir_exists "$dir"
@@ -485,9 +501,15 @@ mysql_initialize() {
    done

    if is_file_writable "$DB_CONF_FILE"; then
-        info "Updating 'my.cnf' with custom configuration"
-        mysql_update_custom_config
-        mysql_galera_update_custom_config
+        if is_mounted_dir_empty "$DB_GALERA_MOUNTED_CONF_DIR"; then
+            info "Updating 'my.cnf' with custom configuration"
+            mysql_update_custom_config
+            mysql_galera_update_custom_config
+        else
+            info "Found mounted configuration directory"
+            mysql_copy_mounted_config
+        fi
+        mysql_galera_configure_ssl
    else
        warn "The ${DB_FLAVOR} configuration file '${DB_CONF_FILE}' is not writable or does not exist. Configurations based on environment variables will not be applied for this file."
    fi
@@ -563,6 +585,24 @@ EOF
    fi
 }

+########################
+# Copy mounted configuration files
+# Globals:
+#   DB_*
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+mysql_copy_mounted_config() {
+    if ! is_dir_empty "$DB_GALERA_MOUNTED_CONF_DIR"; then
+        if ! cp -Lr "$DB_GALERA_MOUNTED_CONF_DIR"/* "$DB_GALERA_CONF_DIR"; then
+            error "Issue copying mounted configuration files from $DB_GALERA_MOUNTED_CONF_DIR to $DB_GALERA_CONF_DIR. Make sure you are not mounting configuration files in $DB_GALERA_CONF_DIR and $DB_GALERA_MOUNTED_CONF_DIR at the same time"
+            exit 1
+        fi
+    fi
+}
+
 ########################
 # Run custom initialization scripts
 # Globals:
@@ -738,6 +778,7 @@ EOF
        false
    fi
 }
+
 #!/bin/bash
 #
 # Library for mysql common
--- a/bitnami/mariadb-galera/10.3/debian-10/rootfs/opt/bitnami/scripts/mariadb-env.sh
+++ b/bitnami/mariadb-galera/10.3/debian-10/rootfs/opt/bitnami/scripts/mariadb-env.sh
@@ -48,6 +48,8 @@ mariadb_env_vars=(
    MARIADB_CLIENT_SSL_CERT_FILE
    MARIADB_CLIENT_SSL_KEY_FILE
    MARIADB_CLIENT_EXTRA_FLAGS
+    MARIADB_GALERA_CONF_DIR
+    MARIADB_GALERA_MOUNTED_CONF_DIR
    MARIADB_GALERA_FORCE_SAFETOBOOTSTRAP
    MARIADB_GALERA_CLUSTER_BOOTSTRAP
    MARIADB_GALERA_CLUSTER_ADDRESS
@@ -191,6 +193,10 @@ export MARIADB_GALERA_DEFAULT_MARIABACKUP_PASSWORD=""
 export DB_GALERA_DEFAULT_MARIABACKUP_PASSWORD="$MARIADB_GALERA_DEFAULT_MARIABACKUP_PASSWORD"

 # Galera cluster configuration.
+export MARIADB_GALERA_CONF_DIR="${MARIADB_GALERA_CONF_DIR:-/opt/bitnami/mariadb/conf}"
+export DB_GALERA_CONF_DIR="$MARIADB_GALERA_CONF_DIR"
+export MARIADB_GALERA_MOUNTED_CONF_DIR="${MARIADB_GALERA_MOUNTED_CONF_DIR:-/bitnami/conf}"
+export DB_GALERA_MOUNTED_CONF_DIR="$MARIADB_GALERA_MOUNTED_CONF_DIR"
 export MARIADB_GALERA_FORCE_SAFETOBOOTSTRAP="${MARIADB_GALERA_FORCE_SAFETOBOOTSTRAP:-}"
 export DB_GALERA_FORCE_SAFETOBOOTSTRAP="$MARIADB_GALERA_FORCE_SAFETOBOOTSTRAP"
 export MARIADB_GALERA_CLUSTER_BOOTSTRAP="${MARIADB_GALERA_CLUSTER_BOOTSTRAP:-}"
--- a/bitnami/mariadb-galera/README.md
+++ b/bitnami/mariadb-galera/README.md
@@ -49,7 +49,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t

 * [`10.5`, `10.5-debian-10`, `10.5.10`, `10.5.10-debian-10-r25`, `latest` (10.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.5.10-debian-10-r25/10.5/debian-10/Dockerfile)
 * [`10.4`, `10.4-debian-10`, `10.4.19`, `10.4.19-debian-10-r26` (10.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.4.19-debian-10-r26/10.4/debian-10/Dockerfile)
-* [`10.3`, `10.3-debian-10`, `10.3.29`, `10.3.29-debian-10-r26` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.3.29-debian-10-r26/10.3/debian-10/Dockerfile)
+* [`10.3`, `10.3-debian-10`, `10.3.29`, `10.3.29-debian-10-r27` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.3.29-debian-10-r27/10.3/debian-10/Dockerfile)
 * [`10.2`, `10.2-debian-10`, `10.2.38`, `10.2.38-debian-10-r26` (10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.2.38-debian-10-r26/10.2/debian-10/Dockerfile)

 Subscribe to project updates by watching the [bitnami/mariadb-galera GitHub repo](https://github.com/bitnami/bitnami-docker-mariadb-galera).