diff --git a/bitnami/elasticsearch/8/debian-11/Dockerfile b/bitnami/elasticsearch/8/debian-11/Dockerfile index 100e01df1c54..242c5025c1b3 100644 --- a/bitnami/elasticsearch/8/debian-11/Dockerfile +++ b/bitnami/elasticsearch/8/debian-11/Dockerfile @@ -12,8 +12,8 @@ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip hostname libasound2-dev libc6 libfreetype6 libfreetype6-dev libgcc1 procps tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "yq" "4.25.3-1" --checksum 042fde05fc288b0b4dc0e0de0348990e95e75c2222927f5c961ea239167a0a6f -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "17.0.3-150" --checksum 3641fab618ebea99ea7d4fe840a27f255159fdfb4f8aa77954b02d93162a4217 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "yq" "4.25.3-2" --checksum 84ce4016efca8b6a6713d69e9d7c19003d4a530f8b420fb8cdcaa9cf9af47ee6 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "17.0.3-1-0" --checksum 383e127eeb902181a35094deb7dcecaf0c4b7f8075c17331219b247d27a28207 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-151" --checksum 089bb11a3bc6031c5a91ab5f9534e9e7e41b928d10d72a3986f16bb61d3a9900 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "elasticsearch" "8.3.2-0" --checksum c50c6c91f3db166612ad7b52105b1550e060ea2d3ac817b5dc4752a46ab50d66 RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index dc09160b1b6f..f3d30e003a03 100644 --- a/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,16 +15,16 @@ }, "java": { "arch": "amd64", - "digest": "3641fab618ebea99ea7d4fe840a27f255159fdfb4f8aa77954b02d93162a4217", + "digest": "383e127eeb902181a35094deb7dcecaf0c4b7f8075c17331219b247d27a28207", "distro": "debian-11", "type": "NAMI", - "version": "17.0.3-150" + "version": "17.0.3-1-0" }, "yq": { "arch": "amd64", - "digest": "042fde05fc288b0b4dc0e0de0348990e95e75c2222927f5c961ea239167a0a6f", + "digest": "84ce4016efca8b6a6713d69e9d7c19003d4a530f8b420fb8cdcaa9cf9af47ee6", "distro": "debian-11", "type": "NAMI", - "version": "4.25.3-1" + "version": "4.25.3-2" } } \ No newline at end of file diff --git a/bitnami/elasticsearch/8/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh b/bitnami/elasticsearch/8/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh index 751663344881..80582ad439bc 100644 --- a/bitnami/elasticsearch/8/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh +++ b/bitnami/elasticsearch/8/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh @@ -235,19 +235,21 @@ elasticsearch_validate() { } validate_node_roles() { - read -r -a roles_list <<<"$(tr ',;' ' ' <<<"$ELASTICSEARCH_NODE_ROLES")" - if [[ "${#roles_list[@]}" -le 0 ]]; then - warn "Setting ELASTICSEARCH_NODE_ROLES is empty and ELASTICSEARCH_IS_DEDICATED_NODE is set to true, Elasticsearch will be configured as coordinating-only node." - fi - for role in "${roles_list[@]}"; do - case "$role" in - master | data | data_content | data_hot | data_warm | data_cold | data_frozen | ingest | ml | remote_cluster_client | transform) ;; + if [ -n "$ELASTICSEARCH_NODE_ROLES" ]; then + read -r -a roles_list <<<"$(tr ',;' ' ' <<<"$ELASTICSEARCH_NODE_ROLES")" + if [[ "${#roles_list[@]}" -le 0 ]]; then + warn "Setting ELASTICSEARCH_NODE_ROLES is empty and ELASTICSEARCH_IS_DEDICATED_NODE is set to true, Elasticsearch will be configured as coordinating-only node." + fi + for role in "${roles_list[@]}"; do + case "$role" in + master | data | data_content | data_hot | data_warm | data_cold | data_frozen | ingest | ml | remote_cluster_client | transform) ;; - *) - print_validation_error "Invalid node role '$role'. Supported roles are 'master,data,data_content,data_hot,data_warm,data_cold,data_frozen,ingest,ml,remote_cluster_client,transform'" - ;; - esac - done + *) + print_validation_error "Invalid node role '$role'. Supported roles are 'master,data,data_content,data_hot,data_warm,data_cold,data_frozen,ingest,ml,remote_cluster_client,transform'" + ;; + esac + done + fi } # Temporary fix until ELASTICSEARCH_NODE_TYPE is removed to ensure the correct permissions to run 'elasticsearch --version' @@ -257,7 +259,7 @@ elasticsearch_validate() { ensure_dir_exists "$dir" am_i_root && chown -R "$ELASTICSEARCH_DAEMON_USER:$ELASTICSEARCH_DAEMON_GROUP" "$dir" done - + es_version="$(elasticsearch_get_version)" es_major_version="$(get_sematic_version "$es_version" 1)" @@ -360,9 +362,13 @@ elasticsearch_cluster_configuration() { false fi else - read -r -a roles_list <<<"$(tr ',;' ' ' <<<"$ELASTICSEARCH_NODE_ROLES")" - if [[ " ${roles_list[*]} " = *" master "* ]]; then - true + if [ -n "$ELASTICSEARCH_NODE_ROLES" ]; then + read -r -a roles_list <<<"$(tr ',;' ' ' <<<"$ELASTICSEARCH_NODE_ROLES")" + if [[ " ${roles_list[*]} " = *" master "* ]]; then + true + else + false + fi else false fi @@ -614,7 +620,7 @@ elasticsearch_set_heap_size() { heap_size=32768m fi fi - debug "Setting '-Xmx${heap_size} -Xms${heap_size}' heap options..." + debug "Setting '-Xmx${heap_size} -Xms${heap_size}' heap options..." cat >"${ELASTICSEARCH_CONF_DIR}/jvm.options.d/heap.options" <