From 53283b4eb0329d0d448a09a1a2029a6ae68b83e1 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 20 May 2024 17:58:24 +0200
Subject: [PATCH] [bitnami/opensearch] Release 1.3.16-debian-12-r3 (#67147)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/opensearch/1/debian-12/Dockerfile     |  6 ++--
 .../opt/bitnami/.bitnami_components.json      |  2 +-
 .../opt/bitnami/scripts/libopensearch.sh      | 28 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/bitnami/opensearch/1/debian-12/Dockerfile b/bitnami/opensearch/1/debian-12/Dockerfile
index 17a25e45225f..b4051367c698 100644
--- a/bitnami/opensearch/1/debian-12/Dockerfile
+++ b/bitnami/opensearch/1/debian-12/Dockerfile
@@ -9,11 +9,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-05-13T23:54:15Z" \
+      org.opencontainers.image.created="2024-05-20T14:52:56Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/opensearch/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.3.16-debian-12-r2" \
+      org.opencontainers.image.ref.name="1.3.16-debian-12-r3" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/opensearch" \
       org.opencontainers.image.title="opensearch" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -32,7 +32,7 @@ RUN install_packages ca-certificates curl libgcc-s1 libgomp1 libstdc++6 procps z
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
       "yq-4.44.1-1-linux-${OS_ARCH}-debian-12" \
-      "java-17.0.11-10-1-linux-${OS_ARCH}-debian-12" \
+      "java-17.0.11-12-0-linux-${OS_ARCH}-debian-12" \
       "opensearch-1.3.16-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/opensearch/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/opensearch/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index bbdbf22c493f..3413f7a00546 100644
--- a/bitnami/opensearch/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/opensearch/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "17.0.11-10-1"
+        "version": "17.0.11-12-0"
     },
     "opensearch": {
         "arch": "amd64",
diff --git a/bitnami/opensearch/1/debian-12/rootfs/opt/bitnami/scripts/libopensearch.sh b/bitnami/opensearch/1/debian-12/rootfs/opt/bitnami/scripts/libopensearch.sh
index 1059be1f3a95..8f5142e5eb46 100644
--- a/bitnami/opensearch/1/debian-12/rootfs/opt/bitnami/scripts/libopensearch.sh
+++ b/bitnami/opensearch/1/debian-12/rootfs/opt/bitnami/scripts/libopensearch.sh
@@ -723,6 +723,20 @@ elasticsearch_initialize() {
         am_i_root && is_mounted_dir_empty "$dir" && chown -R "$DB_DAEMON_USER:$DB_DAEMON_GROUP" "$dir"
     done
 
+    if is_file_writable "${DB_CONF_DIR}/jvm.options" && is_file_writable "${DB_CONF_DIR}/jvm.options.d"; then
+        if is_boolean_yes "$DB_DISABLE_JVM_HEAP_DUMP"; then
+            info "Disabling JVM heap dumps..."
+            replace_in_file "${DB_CONF_DIR}/jvm.options" "-XX:[+]HeapDumpOnOutOfMemoryError" "# -XX:+HeapDumpOnOutOfMemoryError"
+        fi
+        if is_boolean_yes "$DB_DISABLE_GC_LOGS"; then
+            info "Disabling JVM GC logs..."
+            replace_in_file "${DB_CONF_DIR}/jvm.options" "(^.*logs[/]gc.log.*$)" "# \1"
+        fi
+        elasticsearch_set_heap_size
+    else
+        warn "The JVM options configuration files are not writable. Configurations based on environment variables will not be applied"
+    fi
+
     if [[ -f "$DB_CONF_FILE" ]]; then
         info "Custom configuration file detected, using it..."
     else
@@ -773,20 +787,6 @@ elasticsearch_initialize() {
             fi
         fi
     fi
-
-    if is_file_writable "${DB_CONF_DIR}/jvm.options" && is_file_writable "${DB_CONF_DIR}/jvm.options.d"; then
-        if is_boolean_yes "$DB_DISABLE_JVM_HEAP_DUMP"; then
-            info "Disabling JVM heap dumps..."
-            replace_in_file "${DB_CONF_DIR}/jvm.options" "-XX:[+]HeapDumpOnOutOfMemoryError" "# -XX:+HeapDumpOnOutOfMemoryError"
-        fi
-        if is_boolean_yes "$DB_DISABLE_GC_LOGS"; then
-            info "Disabling JVM GC logs..."
-            replace_in_file "${DB_CONF_DIR}/jvm.options" "(^.*logs[/]gc.log.*$)" "# \1"
-        fi
-        elasticsearch_set_heap_size
-    else
-        warn "The JVM options configuration files are not writable. Configurations based on environment variables will not be applied"
-    fi
 }
 
 ########################