From 8cfb3377ada52cfe1c107bea2207e388c200e28b Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Fri, 5 Apr 2024 00:06:34 +0200
Subject: [PATCH] [bitnami/solr] Release 8.11.3-debian-12-r2 (#64764)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/solr/8/debian-12/Dockerfile                         | 6 +++---
 .../prebuildfs/opt/bitnami/.bitnami_components.json         | 2 +-
 .../solr/8/debian-12/rootfs/opt/bitnami/scripts/solr-env.sh | 2 ++
 bitnami/solr/README.md                                      | 6 +++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bitnami/solr/8/debian-12/Dockerfile b/bitnami/solr/8/debian-12/Dockerfile
index 0bf068163ad6..312033811d77 100644
--- a/bitnami/solr/8/debian-12/Dockerfile
+++ b/bitnami/solr/8/debian-12/Dockerfile
@@ -8,10 +8,10 @@ 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-03-31T19:58:37Z" \
+      org.opencontainers.image.created="2024-04-04T20:15:02Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.11.3-debian-12-r1" \
+      org.opencontainers.image.ref.name="8.11.3-debian-12-r2" \
       org.opencontainers.image.title="solr" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.11.3"
@@ -28,7 +28,7 @@ RUN install_packages acl ca-certificates curl lsof netcat-openbsd procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
       "java-17.0.10-13-2-linux-${OS_ARCH}-debian-12" \
-      "solr-8.11.3-0-linux-${OS_ARCH}-debian-12" \
+      "solr-8.11.3-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/solr/8/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/solr/8/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index f0624fdb133f..441497445de4 100644
--- a/bitnami/solr/8/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/solr/8/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,6 +9,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "8.11.3-0"
+        "version": "8.11.3-1"
     }
 }
\ No newline at end of file
diff --git a/bitnami/solr/8/debian-12/rootfs/opt/bitnami/scripts/solr-env.sh b/bitnami/solr/8/debian-12/rootfs/opt/bitnami/scripts/solr-env.sh
index c5a49380d38d..e7208716fae5 100644
--- a/bitnami/solr/8/debian-12/rootfs/opt/bitnami/scripts/solr-env.sh
+++ b/bitnami/solr/8/debian-12/rootfs/opt/bitnami/scripts/solr-env.sh
@@ -46,6 +46,7 @@ solr_env_vars=(
     SOLR_ZK_MAX_RETRIES
     SOLR_ZK_SLEEP_TIME
     SOLR_ZK_CHROOT
+    SOLR_ZK_HOSTS
     SOLR_COLLECTION
 )
 for env_var in "${solr_env_vars[@]}"; do
@@ -107,5 +108,6 @@ export SOLR_DAEMON_GROUP="solr"
 export SOLR_ZK_MAX_RETRIES="${SOLR_ZK_MAX_RETRIES:-5}"
 export SOLR_ZK_SLEEP_TIME="${SOLR_ZK_SLEEP_TIME:-5}"
 export SOLR_ZK_CHROOT="${SOLR_ZK_CHROOT:-/solr}"
+export SOLR_ZK_HOSTS="${SOLR_ZK_HOSTS:-}"
 
 # Custom environment variables may be defined below
diff --git a/bitnami/solr/README.md b/bitnami/solr/README.md
index d2353d8003ad..59e60ec9ae59 100644
--- a/bitnami/solr/README.md
+++ b/bitnami/solr/README.md
@@ -168,7 +168,7 @@ docker-compose up -d
 | `SOLR_ZK_MAX_RETRIES`           | Maximum retries when waiting for zookeeper configuration operations to finish | `5`                                                |
 | `SOLR_ZK_SLEEP_TIME`            | Sleep time when waiting for zookeeper configuration operations to finish      | `5`                                                |
 | `SOLR_ZK_CHROOT`                | ZooKeeper ZNode chroot where to store solr data. Default: /solr               | `/solr`                                            |
-| `SOLR_ZK_HOSTS`                 | ZooKeeper nodes (comma-separated list of `host:port`)                         | unset                                              |
+| `SOLR_ZK_HOSTS`                 | ZooKeeper nodes (comma-separated list of `host:port`\)                        | `nil`                                              |
 
 #### Read-only environment variables
 
@@ -307,6 +307,10 @@ docker-compose up solr
 
 ## Notable Changes
 
+### 8.11.3-debian-12-r2 and 9.5.0-debian-12-r7
+
+* Remove HDFS modules due to CVEs
+
 ### 8.8.0-debian-10-r11
 
 * Adds SSL support.