From 105f5f954efc2feebfafd6cf02ee1b06c3c1b59c Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 11 Oct 2022 20:15:17 +0200
Subject: [PATCH] [bitnami/matomo] Release 4.12.0-debian-11-r0 (#9822)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/matomo/4/debian-11/Dockerfile                     | 8 ++++----
 .../prebuildfs/opt/bitnami/.bitnami_components.json       | 4 ++--
 .../4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh   | 4 ++--
 bitnami/matomo/4/debian-11/tags-info.yaml                 | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bitnami/matomo/4/debian-11/Dockerfile b/bitnami/matomo/4/debian-11/Dockerfile
index 7eaea1107dc9..f79db33d503c 100644
--- a/bitnami/matomo/4/debian-11/Dockerfile
+++ b/bitnami/matomo/4/debian-11/Dockerfile
@@ -4,11 +4,11 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="4.11.0-debian-11-r28" \
+      org.opencontainers.image.ref.name="4.12.0-debian-11-r0" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/matomo" \
       org.opencontainers.image.title="matomo" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="4.11.0"
+      org.opencontainers.image.version="4.12.0"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -27,7 +27,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       "libphp-8.1.11-1-linux-${OS_ARCH}-debian-11" \
       "ini-file-1.4.3-154-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.3-154-linux-${OS_ARCH}-debian-11" \
-      "matomo-4.11.0-3-linux-${OS_ARCH}-debian-11" \
+      "matomo-4.12.0-0-linux-${OS_ARCH}-debian-11" \
       "gosu-1.14.0-155-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
@@ -52,7 +52,7 @@ RUN /opt/bitnami/scripts/matomo/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
 ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
-    APP_VERSION="4.11.0" \
+    APP_VERSION="4.12.0" \
     BITNAMI_APP_NAME="matomo" \
     PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH"
 
diff --git a/bitnami/matomo/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/matomo/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index e59045e4b12a..43c536d98984 100644
--- a/bitnami/matomo/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/matomo/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -29,10 +29,10 @@
     },
     "matomo": {
         "arch": "amd64",
-        "digest": "6ffc7edaf27c4209fb92350decf8cf963cf686d150f88db30d3b56f77f1c801c",
+        "digest": "ae1464d4a876f5ddd1c349929b94f878fe345ae7d9afaf779a41a8e9d96aadcc",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "4.11.0-3"
+        "version": "4.12.0-0"
     },
     "mysql-client": {
         "arch": "amd64",
diff --git a/bitnami/matomo/4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/matomo/4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
index 92530b32d94d..5e141d4ce3f1 100644
--- a/bitnami/matomo/4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/matomo/4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -519,7 +519,7 @@ get_machine_id() {
 get_disk_device_id() {
     local device_id=""
     if grep -q ^/dev /proc/mounts; then
-        device_id="$(grep -q ^/dev /proc/mounts | awk '$2 == "/" { print $1 }' | tail -1)"
+        device_id="$(grep ^/dev /proc/mounts | awk '$2 == "/" { print $1 }' | tail -1)"
     fi
     # If it could not be autodetected, fallback to /dev/sda1 as a default
     if [[ -z "$device_id" || ! -b "$device_id" ]]; then
@@ -538,7 +538,7 @@ get_disk_device_id() {
 #   Root disk ID
 #########################
 get_root_disk_device_id() {
-    get_disk_device_id | sed 's/[0-9]\+$//'
+    get_disk_device_id | sed -E 's/p?[0-9]+$//'
 }
 
 ########################
diff --git a/bitnami/matomo/4/debian-11/tags-info.yaml b/bitnami/matomo/4/debian-11/tags-info.yaml
index 5d0f369dfba4..36dc13d7e92c 100644
--- a/bitnami/matomo/4/debian-11/tags-info.yaml
+++ b/bitnami/matomo/4/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
   - "4"
   - "4-debian-11"
-  - "4.11.0"
+  - "4.12.0"
   - "latest"