From d9142e3f1e1d9cc119c6720b660e471bfededc95 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 17 Jun 2020 18:58:02 +0000 Subject: [PATCH] 10.3.23-debian-10-r36 release --- bitnami/mariadb/10.3/debian-10/Dockerfile | 2 +- .../debian-10/rootfs/opt/bitnami/scripts/libmariadb.sh | 10 ++++++++-- bitnami/mariadb/README.md | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bitnami/mariadb/10.3/debian-10/Dockerfile b/bitnami/mariadb/10.3/debian-10/Dockerfile index 19519cf9b170..b01a63cbe8c7 100644 --- a/bitnami/mariadb/10.3/debian-10/Dockerfile +++ b/bitnami/mariadb/10.3/debian-10/Dockerfile @@ -19,7 +19,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.3.23-debian-10-r35" \ + BITNAMI_IMAGE_VERSION="10.3.23-debian-10-r36" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" EXPOSE 3306 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 0a2fe92d1d23..757478942659 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 @@ -674,10 +674,16 @@ mysql_install_db() { ######################### mysql_upgrade() { local -a args=("--defaults-file=${DB_CONF_FILE}" "-u" "$DB_ROOT_USER" "--force") - local major_version + local major_version minor_version patch_version major_version="$(get_sematic_version "$(mysql_get_version)" 1)" + minor_version="$(get_sematic_version "$(mysql_get_version)" 2)" + patch_version="$(get_sematic_version "$(mysql_get_version)" 3)" info "Running mysql_upgrade" - if [[ "$DB_FLAVOR" = "mysql" ]] && [[ "$major_version" -ge "8" ]]; then + if [[ "$DB_FLAVOR" = "mysql" ]] && [[ + "$major_version" -gt "8" + || ( "$major_version" -eq "8" && "$minor_version" -gt "0" ) + || ( "$major_version" -eq "8" && "$minor_version" -eq "0" && "$patch_version" -ge "16" ) + ]]; then mysql_stop mysql_start_bg "--upgrade=FORCE" else diff --git a/bitnami/mariadb/README.md b/bitnami/mariadb/README.md index 961a4d519926..d5a45d17e934 100644 --- a/bitnami/mariadb/README.md +++ b/bitnami/mariadb/README.md @@ -45,7 +45,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`10.4-debian-10`, `10.4.13-debian-10-r35`, `10.4`, `10.4.13` (10.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.4.13-debian-10-r35/10.4/debian-10/Dockerfile) -* [`10.3-debian-10`, `10.3.23-debian-10-r35`, `10.3`, `10.3.23`, `latest` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.3.23-debian-10-r35/10.3/debian-10/Dockerfile) +* [`10.3-debian-10`, `10.3.23-debian-10-r36`, `10.3`, `10.3.23`, `latest` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.3.23-debian-10-r36/10.3/debian-10/Dockerfile) * [`10.2-debian-10`, `10.2.32-debian-10-r36`, `10.2`, `10.2.32` (10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.2.32-debian-10-r36/10.2/debian-10/Dockerfile) * [`10.1-debian-10`, `10.1.45-debian-10-r37`, `10.1`, `10.1.45` (10.1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.1.45-debian-10-r37/10.1/debian-10/Dockerfile)