From 5e4bac85df1388a9726c1bece4e419fb10ba486e Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 7 Oct 2024 10:38:47 +0200
Subject: [PATCH] [bitnami/mongodb] Release mongodb-8.0.0-debian-12-r1 (#73130)

Signed-off-by: Bitnami Bot <bitnami-bot@vmware.com>
---
 bitnami/mongodb/8.0/debian-12/Dockerfile      |  6 +++---
 .../opt/bitnami/.bitnami_components.json      |  2 +-
 .../rootfs/opt/bitnami/scripts/libmongodb.sh  | 20 ++++++++++++++++---
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/bitnami/mongodb/8.0/debian-12/Dockerfile b/bitnami/mongodb/8.0/debian-12/Dockerfile
index db77004fa187..81fbf1477baa 100644
--- a/bitnami/mongodb/8.0/debian-12/Dockerfile
+++ b/bitnami/mongodb/8.0/debian-12/Dockerfile
@@ -7,11 +7,11 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-10-04T11:07:42Z" \
+      org.opencontainers.image.created="2024-10-07T08:11:23Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mongodb/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.0.0-debian-12-r0" \
+      org.opencontainers.image.ref.name="8.0.0-debian-12-r1" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mongodb" \
       org.opencontainers.image.title="mongodb" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -32,7 +32,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
       "wait-for-port-1.0.8-5-linux-${OS_ARCH}-debian-12" \
       "render-template-1.0.7-5-linux-${OS_ARCH}-debian-12" \
       "mongodb-shell-2.3.1-0-linux-${OS_ARCH}-debian-12" \
-      "mongodb-8.0.0-0-linux-${OS_ARCH}-debian-12" \
+      "mongodb-8.0.0-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/mongodb/8.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb/8.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 4acd81042926..7d4c5a896a4d 100644
--- a/bitnami/mongodb/8.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/mongodb/8.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "8.0.0-0"
+        "version": "8.0.0-1"
     },
     "mongodb-shell": {
         "arch": "amd64",
diff --git a/bitnami/mongodb/8.0/debian-12/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb/8.0/debian-12/rootfs/opt/bitnami/scripts/libmongodb.sh
index 676ca680febd..68664a79e015 100644
--- a/bitnami/mongodb/8.0/debian-12/rootfs/opt/bitnami/scripts/libmongodb.sh
+++ b/bitnami/mongodb/8.0/debian-12/rootfs/opt/bitnami/scripts/libmongodb.sh
@@ -158,7 +158,7 @@ Available options are 'primary/secondary/arbiter/hidden'"
     fi
 
     check_yes_no_value "MONGODB_ENABLE_MAJORITY_READ"
-    [[ "$(mongodb_get_version)" =~ ^5\..\. ]] && ! is_boolean_yes "$MONGODB_ENABLE_MAJORITY_READ" && warn "MONGODB_ENABLE_MAJORITY_READ=${MONGODB_ENABLE_MAJORITY_READ} Will be ignored in MongoDB 5.0"
+    [[ "$(mongodb_get_major_version)" -eq 5 ]] && ! is_boolean_yes "$MONGODB_ENABLE_MAJORITY_READ" && warn "MONGODB_ENABLE_MAJORITY_READ=${MONGODB_ENABLE_MAJORITY_READ} Will be ignored in MongoDB 5.0"
 
     if [[ -n "$MONGODB_REPLICA_SET_KEY" ]] && ((${#MONGODB_REPLICA_SET_KEY} < 5)); then
         error_message="MONGODB_REPLICA_SET_KEY must be, at least, 5 characters long!"
@@ -489,7 +489,7 @@ mongodb_set_journal_conf() {
 
     if ! mongodb_is_file_external "$conf_file_name"; then
         # Disable journal.enabled since it is not supported from 7.0 on
-        if [[ "$(mongodb_get_version)" =~ ^7\..\. ]]; then
+        if [[ "$(mongodb_get_major_version)" -ge 7 ]]; then
             mongodb_conf="$(sed '/journal:/,/enabled: .*/d' "$conf_file_path")"
             echo "$mongodb_conf" >"$conf_file_path"
         else
@@ -669,7 +669,7 @@ mongodb_set_replicasetmode_conf() {
             mongodb_config_apply_regex "replSetName:.*" "replSetName: $MONGODB_REPLICA_SET_NAME" "$conf_file_path"
         fi
         if [[ -n "$MONGODB_ENABLE_MAJORITY_READ" ]]; then
-            mongodb_config_apply_regex "enableMajorityReadConcern:.*" "enableMajorityReadConcern: $({ (is_boolean_yes "$MONGODB_ENABLE_MAJORITY_READ" || [[ "$(mongodb_get_version)" =~ ^5\..\. ]]) && echo 'true'; } || echo 'false')" "$conf_file_path"
+            mongodb_config_apply_regex "enableMajorityReadConcern:.*" "enableMajorityReadConcern: $({ (is_boolean_yes "$MONGODB_ENABLE_MAJORITY_READ" || [[ "$(mongodb_get_major_version)" -eq 5 ]]) && echo 'true'; } || echo 'false')" "$conf_file_path"
         fi
     else
         debug "$conf_file_name mounted. Skipping replicaset mode enabling"
@@ -1524,6 +1524,20 @@ mongodb_get_version() {
     mongod --version 2>/dev/null | awk -F\" '/"version"/ {print $4}'
 }
 
+########################
+# Get MongoDB major version
+# Globals:
+#   MONGODB_*
+# Arguments:
+#   None
+# Returns:
+#   major version
+#########################
+mongodb_get_major_version() {
+    # shellcheck disable=SC2005
+    echo "$(mongodb_get_version)" | cut --delimiter='.' --fields=1
+}
+
 ########################
 # Run custom initialization scripts
 # Globals: