From 5cf282e1ebb2f320298700eb1d2e2362fb87d7a0 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 6 May 2021 13:34:39 +0000
Subject: [PATCH] 8.8.2-debian-10-r22 release

---
 bitnami/solr/8/debian-10/Dockerfile                           | 2 +-
 .../prebuildfs/opt/bitnami/scripts/libvalidations.sh          | 2 +-
 .../debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh  | 4 +++-
 bitnami/solr/README.md                                        | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bitnami/solr/8/debian-10/Dockerfile b/bitnami/solr/8/debian-10/Dockerfile
index 9c3e517aa601..b827c5b1fa1a 100644
--- a/bitnami/solr/8/debian-10/Dockerfile
+++ b/bitnami/solr/8/debian-10/Dockerfile
@@ -17,7 +17,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/solr/postunpack.sh
 ENV BITNAMI_APP_NAME="solr" \
-    BITNAMI_IMAGE_VERSION="8.8.2-debian-10-r21" \
+    BITNAMI_IMAGE_VERSION="8.8.2-debian-10-r22" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/solr/bin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 8983
diff --git a/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index 8d827924afe4..ca5afc91c7b5 100644
--- a/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libvalidations.sh
@@ -181,7 +181,7 @@ validate_ipv4() {
     local stat=1
 
     if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-	read -r -a ip_array <<< "$(tr '.' ' ' <<< "$ip")"
+        read -r -a ip_array <<< "$(tr '.' ' ' <<< "$ip")"
         [[ ${ip_array[0]} -le 255 && ${ip_array[1]} -le 255 \
             && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]]
         stat=$?
diff --git a/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index da97ed81c921..1280134f015c 100644
--- a/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -180,6 +180,7 @@ web_server_reload() {
 #   --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup
 # NGINX-specific flags:
 #   --nginx-additional-configuration - Additional server block configuration (no default)
+#   --nginx-external-configuration - Configuration external to server block (no default)
 # Returns:
 #   true if the configuration was enabled, false otherwise
 ########################
@@ -220,7 +221,8 @@ ensure_web_server_app_configuration_exists() {
                 ;;
 
             # Specific NGINX flags
-            --nginx-additional-configuration)
+            --nginx-additional-configuration \
+            | --nginx-external-configuration)
                 nginx_args+=("${1//nginx-/}" "${2:?missing value}")
                 shift
                 ;;
diff --git a/bitnami/solr/README.md b/bitnami/solr/README.md
index 3a90524adac0..e1c9189ca74a 100644
--- a/bitnami/solr/README.md
+++ b/bitnami/solr/README.md
@@ -36,7 +36,7 @@ You can find the available configuration options in the [Environment Variables](
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`8`, `8-debian-10`, `8.8.2`, `8.8.2-debian-10-r21`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-solr/blob/8.8.2-debian-10-r21/8/debian-10/Dockerfile)
+* [`8`, `8-debian-10`, `8.8.2`, `8.8.2-debian-10-r22`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-solr/blob/8.8.2-debian-10-r22/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/solr GitHub repo](https://github.com/bitnami/bitnami-docker-solr).