From 7122b2292869bf5a252ff3b5e97208baa4e59f01 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Tue, 18 May 2021 16:48:27 +0000
Subject: [PATCH] 4.3.0-debian-10-r1 release

---
 bitnami/matomo/4/debian-10/Dockerfile           |  2 +-
 .../opt/bitnami/scripts/libmysqlclient.sh       | 17 +++++++++++++++++
 bitnami/matomo/README.md                        |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/bitnami/matomo/4/debian-10/Dockerfile b/bitnami/matomo/4/debian-10/Dockerfile
index b30cf655a1c7..7c6bfb1bfbd8 100644
--- a/bitnami/matomo/4/debian-10/Dockerfile
+++ b/bitnami/matomo/4/debian-10/Dockerfile
@@ -31,7 +31,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="matomo" \
-    BITNAMI_IMAGE_VERSION="4.3.0-debian-10-r0" \
+    BITNAMI_IMAGE_VERSION="4.3.0-debian-10-r1" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index d89be47282f2..43979b4d54e1 100644
--- a/bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -398,10 +398,27 @@ wait_for_mysql_access() {
 #   None
 #########################
 mysql_stop() {
+    local -r retries=25
+    local -r sleep_time=5
+
+    are_db_files_locked() {
+        local return_value=0
+        read -r -a db_files <<< "$(find "$DB_DATA_DIR" -regex "^.*ibdata[0-9]+" -print0 -o -regex "^.*ib_logfile[0-9]+" -print0 | xargs -0)"
+        for f in "${db_files[@]}"; do
+            debug_execute lsof -w "$f" && return_value=1
+        done
+        return $return_value
+    }
+
     ! is_mysql_running && return
 
     info "Stopping $DB_FLAVOR"
     stop_service_using_pid "$DB_PID_FILE"
+    debug "Waiting for $DB_FLAVOR to unlock db files"
+    if ! retry_while are_db_files_locked "$retries" "$sleep_time"; then
+        error "$DB_FLAVOR failed to stop"
+        return 1
+    fi
 }
 
 ########################
diff --git a/bitnami/matomo/README.md b/bitnami/matomo/README.md
index 8bc713d1effe..57ad24d2344b 100644
--- a/bitnami/matomo/README.md
+++ b/bitnami/matomo/README.md
@@ -36,7 +36,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/).
 
 
-* [`4`, `4-debian-10`, `4.3.0`, `4.3.0-debian-10-r0`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-matomo/blob/4.3.0-debian-10-r0/4/debian-10/Dockerfile)
+* [`4`, `4-debian-10`, `4.3.0`, `4.3.0-debian-10-r1`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-matomo/blob/4.3.0-debian-10-r1/4/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/matomo GitHub repo](https://github.com/bitnami/bitnami-docker-matomo).