From 49b79c21ac46fb9c32c86c71697038d4499ac126 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 11 Jan 2023 19:59:18 +0100
Subject: [PATCH] [bitnami/elasticsearch] Release 7.17.8-debian-11-r11 (#19855)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

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

diff --git a/bitnami/elasticsearch/7/debian-11/Dockerfile b/bitnami/elasticsearch/7/debian-11/Dockerfile
index a1f2370e84c5..414d1519c1d0 100644
--- a/bitnami/elasticsearch/7/debian-11/Dockerfile
+++ b/bitnami/elasticsearch/7/debian-11/Dockerfile
@@ -6,7 +6,8 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="7.17.8-debian-11-r10" \
+      org.opencontainers.image.licenses="Apache-2.0" \
+      org.opencontainers.image.ref.name="7.17.8-debian-11-r11" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/elasticsearch" \
       org.opencontainers.image.title="elasticsearch" \
       org.opencontainers.image.vendor="VMware, Inc." \
diff --git a/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
index f3bc7568bfa5..ad2f0eee48df 100644
--- a/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
+++ b/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
@@ -31,7 +31,7 @@ get_sematic_version () {
 
         while [[ $i -lt $n ]]; do
             if [[ -n "${BASH_REMATCH[$i]}" ]] && [[ "${BASH_REMATCH[$i]:0:1}" != '.' ]];  then
-                version_sections[$j]=${BASH_REMATCH[$i]}
+                version_sections[j]="${BASH_REMATCH[$i]}"
                 ((j++))
             fi
             ((i++))
diff --git a/bitnami/elasticsearch/7/debian-11/rootfs/opt/bitnami/scripts/elasticsearch-env.sh b/bitnami/elasticsearch/7/debian-11/rootfs/opt/bitnami/scripts/elasticsearch-env.sh
index 103aebbfc9b7..68f0acee0bae 100644
--- a/bitnami/elasticsearch/7/debian-11/rootfs/opt/bitnami/scripts/elasticsearch-env.sh
+++ b/bitnami/elasticsearch/7/debian-11/rootfs/opt/bitnami/scripts/elasticsearch-env.sh
@@ -27,7 +27,6 @@ elasticsearch_env_vars=(
     ELASTICSEARCH_BIND_ADDRESS
     ELASTICSEARCH_ADVERTISED_HOSTNAME
     ELASTICSEARCH_CLUSTER_HOSTS
-    ELASTICSEARCH_TOTAL_NODES
     ELASTICSEARCH_CLUSTER_MASTER_HOSTS
     ELASTICSEARCH_CLUSTER_NAME
     ELASTICSEARCH_HEAP_SIZE
@@ -120,7 +119,6 @@ export ELASTICSEARCH_DAEMON_GROUP="elasticsearch"
 export ELASTICSEARCH_BIND_ADDRESS="${ELASTICSEARCH_BIND_ADDRESS:-}"
 export ELASTICSEARCH_ADVERTISED_HOSTNAME="${ELASTICSEARCH_ADVERTISED_HOSTNAME:-}"
 export ELASTICSEARCH_CLUSTER_HOSTS="${ELASTICSEARCH_CLUSTER_HOSTS:-}"
-export ELASTICSEARCH_TOTAL_NODES="${ELASTICSEARCH_TOTAL_NODES:-}"
 export ELASTICSEARCH_CLUSTER_MASTER_HOSTS="${ELASTICSEARCH_CLUSTER_MASTER_HOSTS:-}"
 export ELASTICSEARCH_CLUSTER_NAME="${ELASTICSEARCH_CLUSTER_NAME:-}"
 export ELASTICSEARCH_HEAP_SIZE="${ELASTICSEARCH_HEAP_SIZE:-1024m}"
diff --git a/bitnami/elasticsearch/7/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh b/bitnami/elasticsearch/7/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh
index e6c2468ed53d..e8c79b0a2bd2 100644
--- a/bitnami/elasticsearch/7/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh
+++ b/bitnami/elasticsearch/7/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh
@@ -388,13 +388,9 @@ elasticsearch_cluster_configuration() {
     if [[ -n "$ELASTICSEARCH_CLUSTER_HOSTS" ]]; then
         read -r -a host_list <<<"$(tr ',;' ' ' <<<"$ELASTICSEARCH_CLUSTER_HOSTS")"
         master_list=("${host_list[@]}")
-        total_nodes=${#host_list[@]}
         if [[ -n "$ELASTICSEARCH_CLUSTER_MASTER_HOSTS" ]]; then
             read -r -a master_list <<<"$(tr ',;' ' ' <<<"$ELASTICSEARCH_CLUSTER_MASTER_HOSTS")"
         fi
-        if [[ -n "$ELASTICSEARCH_TOTAL_NODES" ]]; then
-            total_nodes=$ELASTICSEARCH_TOTAL_NODES
-        fi
         es_version="$(elasticsearch_get_version)"
         es_major_version="$(get_sematic_version "$es_version" 1)"
         elasticsearch_conf_set discovery.seed_hosts "${host_list[@]}"