From 5100c09d1f5c14fa25f5133c72a4b457a00832f4 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Thu, 13 Oct 2022 04:55:43 +0200
Subject: [PATCH] [bitnami/opencart] Release 4.0.1-1-debian-11-r11 (#10017)

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

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/opencart/4/debian-11/Dockerfile                       | 4 ++--
 .../4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh       | 4 ++--
 bitnami/opencart/README.md                                    | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bitnami/opencart/4/debian-11/Dockerfile b/bitnami/opencart/4/debian-11/Dockerfile
index 0bc54e04fe44..d3e26221932c 100644
--- a/bitnami/opencart/4/debian-11/Dockerfile
+++ b/bitnami/opencart/4/debian-11/Dockerfile
@@ -4,7 +4,7 @@ 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.0.1-1-debian-11-r9" \
+      org.opencontainers.image.ref.name="4.0.1-1-debian-11-r11" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/opencart" \
       org.opencontainers.image.title="opencart" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -36,7 +36,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       fi && \
       sha256sum -c "${COMPONENT}.tar.gz.sha256" && \
       tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-      rm -rf "${COMPONENT}.tar.gz{,sha256}" ; \
+      rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \
     done
 RUN apt-get update && apt-get upgrade -y && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/opencart/4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/opencart/4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
index 92530b32d94d..5e141d4ce3f1 100644
--- a/bitnami/opencart/4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/opencart/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/opencart/README.md b/bitnami/opencart/README.md
index ec2e24dbc18c..4d4b0afd12fb 100644
--- a/bitnami/opencart/README.md
+++ b/bitnami/opencart/README.md
@@ -40,8 +40,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-11`, `4.0.1-1`, `4.0.1-1-debian-11-r9`, `latest` (4/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/opencart/4/debian-11/Dockerfile)
+You can see the equivalence between the different tags by taking a look at the `tags-info.yaml` file present in the branch folder, i.e `bitnami/ASSET/BRANCH/DISTRO/tags-info.yaml`.
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).