From 00b67ce66337d90c8c68a460a79fef795e543539 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 11 Oct 2022 03:01:20 +0200
Subject: [PATCH] [bitnami/nats] Release 2.9.3-debian-11-r0 (#9792)

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

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

diff --git a/bitnami/nats/2/debian-11/Dockerfile b/bitnami/nats/2/debian-11/Dockerfile
index f9abd7ca16ba..196e2817d06a 100644
--- a/bitnami/nats/2/debian-11/Dockerfile
+++ b/bitnami/nats/2/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="2.9.2-debian-11-r5" \
+      org.opencontainers.image.ref.name="2.9.3-debian-11-r0" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/nats" \
       org.opencontainers.image.title="nats" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="2.9.2"
+      org.opencontainers.image.version="2.9.3"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -23,7 +23,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "render-template-1.0.3-154-linux-${OS_ARCH}-debian-11" \
       "gosu-1.14.0-155-linux-${OS_ARCH}-debian-11" \
-      "nats-2.9.2-1-linux-${OS_ARCH}-debian-11" \
+      "nats-2.9.3-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -32,7 +32,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 autoremove --purge -y curl && \
     apt-get update && apt-get upgrade -y && \
@@ -41,7 +41,7 @@ RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/nats/postunpack.sh
-ENV APP_VERSION="2.9.2" \
+ENV APP_VERSION="2.9.3" \
     BITNAMI_APP_NAME="nats" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/nats/bin:$PATH"
 
diff --git a/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 892ab0f6c5ff..38fd6a7d6170 100644
--- a/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -8,10 +8,10 @@
     },
     "nats": {
         "arch": "amd64",
-        "digest": "dab8ceb10d6c045f28fa8aac10298e7ea412e1c18dbe99fb87df9e80096456c3",
+        "digest": "1911f2263062428c86f3c504f38f618c947c2cc9c5d793c089c35b03c5f24b50",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.9.2-1"
+        "version": "2.9.3-0"
     },
     "render-template": {
         "arch": "amd64",
diff --git a/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
index 92530b32d94d..5e141d4ce3f1 100644
--- a/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/nats/2/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/nats/2/debian-11/tags-info.yaml b/bitnami/nats/2/debian-11/tags-info.yaml
index 47d00b07fa7d..68587e1c58ce 100644
--- a/bitnami/nats/2/debian-11/tags-info.yaml
+++ b/bitnami/nats/2/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
   - "2"
   - "2-debian-11"
-  - "2.9.2"
+  - "2.9.3"
   - "latest"