From 43fc83f290cfcf2a8cdcbe26a2552262f570dfa5 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 17 May 2023 09:15:26 +0100
Subject: [PATCH] [bitnami/solr] Release 8.11.2-debian-11-r111 (#34255)

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

diff --git a/bitnami/solr/8/debian-11/Dockerfile b/bitnami/solr/8/debian-11/Dockerfile
index d83f1996f002..d178acf65d39 100644
--- a/bitnami/solr/8/debian-11/Dockerfile
+++ b/bitnami/solr/8/debian-11/Dockerfile
@@ -4,10 +4,10 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-05-06T11:10:06Z" \
+      org.opencontainers.image.created="2023-05-17T07:43:56Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.11.2-debian-11-r110" \
+      org.opencontainers.image.ref.name="8.11.2-debian-11-r111" \
       org.opencontainers.image.title="solr" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.11.2"
diff --git a/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
index 02c989d693ae..6d9ca8546eef 100644
--- a/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -421,7 +421,7 @@ generate_random_string() {
     alphanumeric+special|special+alphanumeric)
         # Limit variety of special characters, so there is a higher chance of containing more alphanumeric characters
         # Special characters are harder to write, and it could impact the overall UX if most passwords are too complex
-        filter='a-zA-Z0-9!@#$%^'
+        filter='a-zA-Z0-9:@.,/+!='
         ;;
     *)
         echo "Invalid type ${type}" >&2
diff --git a/bitnami/solr/8/debian-11/rootfs/opt/bitnami/scripts/libsolr.sh b/bitnami/solr/8/debian-11/rootfs/opt/bitnami/scripts/libsolr.sh
index e0dfb558ff46..970d65e26f71 100644
--- a/bitnami/solr/8/debian-11/rootfs/opt/bitnami/scripts/libsolr.sh
+++ b/bitnami/solr/8/debian-11/rootfs/opt/bitnami/scripts/libsolr.sh
@@ -112,7 +112,7 @@ solr_validate() {
     ! is_yes_no_value "$SOLR_ENABLE_CLOUD_MODE" && print_validation_error "SOLR_ENABLE_CLOUD_MODE possible values are yes or no"
     is_boolean_yes "$SOLR_ENABLE_CLOUD_MODE" && [[ -z "$SOLR_ZK_HOSTS" ]] && print_validation_error "You need to provide the Zookeper node list in SOLR_ZK_HOSTS"
 
-    [[ -n "$SOLR_ZK_CHROOT" ]] && [[ ${SOLR_ZK_CHROOT:0:1} != "/" ]] && print_validation_error "SOLR_ZK_CHROOT has to start with '/' char"
+    [[ -n "$SOLR_ZK_CHROOT" ]] && [[ "${SOLR_ZK_CHROOT:0:1}" != "/" ]] && print_validation_error "SOLR_ZK_CHROOT has to start with '/' char"
 
     ! is_boolean_yes "$SOLR_CLOUD_BOOTSTRAP" && is_boolean_yes "$SOLR_ENABLE_CLOUD_MODE" && [[ -n "$SOLR_CORES" ]] && info "This node is not a boostrap node and will not create the collection"
 
diff --git a/bitnami/solr/8/debian-11/rootfs/opt/bitnami/scripts/solr-env.sh b/bitnami/solr/8/debian-11/rootfs/opt/bitnami/scripts/solr-env.sh
index a220d8e87ad3..0adae2b85d00 100644
--- a/bitnami/solr/8/debian-11/rootfs/opt/bitnami/scripts/solr-env.sh
+++ b/bitnami/solr/8/debian-11/rootfs/opt/bitnami/scripts/solr-env.sh
@@ -69,7 +69,6 @@ export SOLR_TMP_DIR="${SOLR_BASE_DIR}/tmp"
 export SOLR_PID_DIR="${SOLR_BASE_DIR}/tmp"
 export SOLR_LOGS_DIR="${SOLR_BASE_DIR}/logs"
 export SOLR_SERVER_DIR="${SOLR_BASE_DIR}/server"
-export SOLR_ZK_CHROOT="${SOLR_ZK_CHROOT:-/solr}"
 
 # Persistence
 export SOLR_VOLUME_DIR="${BITNAMI_VOLUME_DIR}/solr"
@@ -105,5 +104,6 @@ export SOLR_DAEMON_GROUP="solr"
 # Solr retries configuration
 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}"
 
 # Custom environment variables may be defined below