From 0efc01dd7ddde9116c38198b2585b126726d8cfa Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 30 Aug 2023 16:16:30 +0200
Subject: [PATCH] [bitnami/mongodb] Release 5.0.20-debian-11-r5 (#46670)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/mongodb/5.0/debian-11/Dockerfile      |  4 ++--
 .../opt/bitnami/scripts/libvalidations.sh     |  8 +++----
 .../debian-11/prebuildfs/usr/sbin/run-script  | 24 +++++++++++++++++++
 .../rootfs/opt/bitnami/scripts/libmongodb.sh  | 10 ++++++++
 4 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100755 bitnami/mongodb/5.0/debian-11/prebuildfs/usr/sbin/run-script

diff --git a/bitnami/mongodb/5.0/debian-11/Dockerfile b/bitnami/mongodb/5.0/debian-11/Dockerfile
index 95f82f8288aa..e0af9374189e 100644
--- a/bitnami/mongodb/5.0/debian-11/Dockerfile
+++ b/bitnami/mongodb/5.0/debian-11/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-08-27T14:16:44Z" \
+      org.opencontainers.image.created="2023-08-30T13:36:58Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="5.0.20-debian-11-r2" \
+      org.opencontainers.image.ref.name="5.0.20-debian-11-r5" \
       org.opencontainers.image.title="mongodb" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="5.0.20"
diff --git a/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index 54987abca42a..16183f62d080 100644
--- a/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
@@ -4,7 +4,7 @@
 #
 # Validation functions library
 
-# shellcheck disable=SC1091
+# shellcheck disable=SC1091,SC2086
 
 # Load Generic Libraries
 . /opt/bitnami/scripts/liblog.sh
@@ -203,7 +203,7 @@ validate_ipv6() {
     if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then
         stat=0
     fi
-    return "$stat"
+    return $stat
 }
 
 ########################
@@ -223,7 +223,7 @@ validate_ipv4() {
             && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]]
         stat=$?
     fi
-    return "$stat"
+    return $stat
 }
 
 ########################
@@ -242,7 +242,7 @@ validate_ip() {
     else
         stat=$(validate_ipv6 "$ip")
     fi
-    return "$stat"
+    return $stat
 }
 
 ########################
diff --git a/bitnami/mongodb/5.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mongodb/5.0/debian-11/prebuildfs/usr/sbin/run-script
new file mode 100755
index 000000000000..4ca0f897277e
--- /dev/null
+++ b/bitnami/mongodb/5.0/debian-11/prebuildfs/usr/sbin/run-script
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+set -u
+
+if [ $# -eq 0 ]; then
+    >&2 echo "No arguments provided"
+    exit 1
+fi
+
+script=$1
+exit_code="${2:-96}"
+fail_if_not_present="${3:-n}"
+
+if test -f "$script"; then
+  sh $script
+
+  if [ $? -ne 0 ]; then
+    exit $((exit_code))
+  fi
+elif [ "$fail_if_not_present" = "y" ]; then
+  >&2 echo "script not found: $script"
+  exit 127
+fi
diff --git a/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh
index e613c77550f2..16ea58459264 100644
--- a/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh
+++ b/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh
@@ -1389,6 +1389,16 @@ configure_permissions() {
 mongodb_initialize() {
     info "Initializing MongoDB..."
 
+    if am_i_root; then
+        debug "Ensuring MongoDB daemon user/group exists"
+        ensure_user_exists "$MONGODB_DAEMON_USER" --group "$MONGODB_DAEMON_GROUP"
+        debug "Ensuring Mongosh directory '$MONGOSH_DIR' exists"
+        ensure_dir_exists "$MONGOSH_DIR"
+        if [[ -n "${MONGODB_DAEMON_USER:-}" ]]; then
+            chown -R "${MONGODB_DAEMON_USER:-}" "$MONGODB_BASE_DIR" "$MONGODB_DATA_DIR" "$MONGOSH_DIR"
+        fi
+    fi
+
     rm -f "$MONGODB_PID_FILE"
     mongodb_copy_mounted_config
     mongodb_set_net_conf "$MONGODB_CONF_FILE"