diff --git a/bitnami/mariadb/10.3/debian-10/rootfs/opt/bitnami/scripts/libmariadb.sh b/bitnami/mariadb/10.3/debian-10/rootfs/opt/bitnami/scripts/libmariadb.sh index acb4a8f1aa50..c9d921cf4ab3 100644 --- a/bitnami/mariadb/10.3/debian-10/rootfs/opt/bitnami/scripts/libmariadb.sh +++ b/bitnami/mariadb/10.3/debian-10/rootfs/opt/bitnami/scripts/libmariadb.sh @@ -171,8 +171,6 @@ plugin_dir=${DB_BASE_DIR}/lib/plugin port=${DB_DEFAULT_PORT_NUMBER} socket=${DB_SOCKET_FILE} pid_file=${DB_PID_FILE} - -!include ${DB_CONF_DIR}/bitnami/my_custom.cnf EOF } @@ -272,6 +270,9 @@ mysql_initialize() { if is_file_writable "${DB_CONF_DIR}/bitnami/my_custom.cnf"; then info "Injecting custom configuration 'my_custom.cnf'" cat "${DB_CONF_DIR}/my_custom.cnf" > "${DB_CONF_DIR}/bitnami/my_custom.cnf" + if ! grep --silent "!include ${DB_CONF_DIR}/bitnami/my_custom.cnf" "${DB_CONF_FILE}"; then + echo "!include ${DB_CONF_DIR}/bitnami/my_custom.cnf" >> "${DB_CONF_FILE}" + fi else warn "Could not inject custom configuration for the ${DB_FLAVOR} configuration file '$DB_CONF_DIR/bitnami/my_custom.cnf' because it is not writable." fi diff --git a/bitnami/mariadb/README.md b/bitnami/mariadb/README.md index 5d40fe715780..a47c40a2caab 100644 --- a/bitnami/mariadb/README.md +++ b/bitnami/mariadb/README.md @@ -51,7 +51,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`10.6`, `10.6-debian-10`, `10.6.7`, `10.6.7-debian-10-r70` (10.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.6.7-debian-10-r70/10.6/debian-10/Dockerfile) * [`10.5`, `10.5-debian-10`, `10.5.15`, `10.5.15-debian-10-r71` (10.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.5.15-debian-10-r71/10.5/debian-10/Dockerfile) * [`10.4`, `10.4-debian-10`, `10.4.24`, `10.4.24-debian-10-r71` (10.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.4.24-debian-10-r71/10.4/debian-10/Dockerfile) -* [`10.3`, `10.3-debian-10`, `10.3.34`, `10.3.34-debian-10-r72` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.3.34-debian-10-r72/10.3/debian-10/Dockerfile) +* [`10.3`, `10.3-debian-10`, `10.3.34`, `10.3.34-debian-10-r73` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.3.34-debian-10-r73/10.3/debian-10/Dockerfile) * [`10.2`, `10.2-debian-10`, `10.2.43`, `10.2.43-debian-10-r69` (10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.2.43-debian-10-r69/10.2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/mariadb GitHub repo](https://github.com/bitnami/bitnami-docker-mariadb).