public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

10.4.24-debian-10-r30 release

This commit is contained in:
Bitnami Bot 2022-03-17 20:33:21 +00:00
parent fdcf6f3e97
commit 5ee0ab71e0
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/mariadb/10.4/debian-10/Dockerfile
View File

@ -20,7 +20,7 @@ RUN mkdir /docker-entrypoint-initdb.d
COPY rootfs /
RUN /opt/bitnami/scripts/mariadb/postunpack.sh
ENV BITNAMI_APP_NAME="mariadb" \
BITNAMI_IMAGE_VERSION="10.4.24-debian-10-r29" \
BITNAMI_IMAGE_VERSION="10.4.24-debian-10-r30" \
PATH="/opt/bitnami/common/bin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH"
EXPOSE 3306

16
bitnami/mariadb/10.4/debian-10/rootfs/opt/bitnami/scripts/libmariadb.sh
View File

@ -322,18 +322,18 @@ EOF
}
########################
# 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_DATA_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_DATA_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
debug "Executing $f"
case "$f" in
*.sh)
@ -348,7 +348,7 @@ mysql_custom_init_scripts() {
fi
;;
*.sql)
[[ "$DB_REPLICATION_MODE" = "slave" ]] && warn "Custom SQL initdb is not supported on slave nodes, ignoring $f" && continue
[[ "$DB_REPLICATION_MODE" = "slave" ]] && warn "Custom SQL $1db is not supported on slave nodes, ignoring $f" && continue
wait_for_mysql_access "$DB_ROOT_USER"
# Temporarily disabling autocommit to increase performance when importing huge files
if ! mysql_execute_print_output "$DB_DATABASE" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <<< "SET autocommit=0; source ${f}; COMMIT;"; then
@ -357,7 +357,7 @@ mysql_custom_init_scripts() {
fi
;;
*.sql.gz)
[[ "$DB_REPLICATION_MODE" = "slave" ]] && warn "Custom SQL initdb is not supported on slave nodes, ignoring $f" && continue
[[ "$DB_REPLICATION_MODE" = "slave" ]] && warn "Custom SQL $1db is not supported on slave nodes, ignoring $f" && continue
wait_for_mysql_access "$DB_ROOT_USER"
# In this case, it is best to pipe the uncompressed SQL commands directly to the 'mysql' command as extraction may cause problems
# e.g. lack of disk space, permission issues...

4
bitnami/mariadb/10.4/debian-10/rootfs/opt/bitnami/scripts/mariadb/setup.sh
View File

@ -30,7 +30,9 @@ fi
# Ensure MariaDB is initialized
mysql_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

2
bitnami/mariadb/README.md
View File

@ -52,7 +52,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-r29`, `latest` (10.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.6.7-debian-10-r29/10.6/debian-10/Dockerfile)
* [`10.5`, `10.5-debian-10`, `10.5.15`, `10.5.15-debian-10-r29` (10.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.5.15-debian-10-r29/10.5/debian-10/Dockerfile)
* [`10.4`, `10.4-debian-10`, `10.4.24`, `10.4.24-debian-10-r29` (10.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.4.24-debian-10-r29/10.4/debian-10/Dockerfile)
* [`10.4`, `10.4-debian-10`, `10.4.24`, `10.4.24-debian-10-r30` (10.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.4.24-debian-10-r30/10.4/debian-10/Dockerfile)
* [`10.3`, `10.3-debian-10`, `10.3.34`, `10.3.34-debian-10-r31` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.3.34-debian-10-r31/10.3/debian-10/Dockerfile)
* [`10.2`, `10.2-debian-10`, `10.2.43`, `10.2.43-debian-10-r29` (10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.2.43-debian-10-r29/10.2/debian-10/Dockerfile)