From 92478dd74f7a390e22abe0596011d76d4efbbb64 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 23 Oct 2025 19:45:13 +0200 Subject: [PATCH] [bitnami/elasticsearch] Release 9.1.6-debian-12-r0 (#87875) Signed-off-by: Bitnami Bot --- .../elasticsearch/9.1/debian-12/Dockerfile | 13 +++-- .../opt/bitnami/scripts/elasticsearch-env.sh | 7 +++ .../opt/bitnami/scripts/elasticsearch/run.sh | 4 -- .../opt/bitnami/scripts/libelasticsearch.sh | 3 +- bitnami/elasticsearch/README.md | 47 ++++++++++--------- 5 files changed, 41 insertions(+), 33 deletions(-) diff --git a/bitnami/elasticsearch/9.1/debian-12/Dockerfile b/bitnami/elasticsearch/9.1/debian-12/Dockerfile index 6378b4a21c50..f9eaa94922ed 100644 --- a/bitnami/elasticsearch/9.1/debian-12/Dockerfile +++ b/bitnami/elasticsearch/9.1/debian-12/Dockerfile @@ -9,13 +9,13 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-10-06T16:11:55Z" \ + org.opencontainers.image.created="2025-10-23T17:05:55Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/elasticsearch/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/elasticsearch" \ org.opencontainers.image.title="elasticsearch" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="9.1.5" + org.opencontainers.image.version="9.1.6" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -31,9 +31,9 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \ mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "yq-4.47.2-0-linux-${OS_ARCH}-debian-12" \ - "java-21.0.8-12-1-linux-${OS_ARCH}-debian-12" \ - "elasticsearch-9.1.5-0-linux-${OS_ARCH}-debian-12" \ + "yq-4.48.1-1-linux-${OS_ARCH}-debian-12" \ + "java-21.0.9-11-0-linux-${OS_ARCH}-debian-12" \ + "elasticsearch-9.1.6-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -52,9 +52,8 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true COPY rootfs / RUN /opt/bitnami/scripts/elasticsearch/postunpack.sh RUN /opt/bitnami/scripts/java/postunpack.sh -ENV APP_VERSION="9.1.5" \ +ENV APP_VERSION="9.1.6" \ BITNAMI_APP_NAME="elasticsearch" \ - ES_JAVA_HOME="/opt/bitnami/java" \ IMAGE_REVISION="0" \ JAVA_HOME="/opt/bitnami/java" \ LD_LIBRARY_PATH="/opt/bitnami/elasticsearch/jdk/lib:/opt/bitnami/elasticsearch/jdk/lib/server:$LD_LIBRARY_PATH" diff --git a/bitnami/elasticsearch/9.1/debian-12/rootfs/opt/bitnami/scripts/elasticsearch-env.sh b/bitnami/elasticsearch/9.1/debian-12/rootfs/opt/bitnami/scripts/elasticsearch-env.sh index e5b3ebf61111..13659c4c7b78 100644 --- a/bitnami/elasticsearch/9.1/debian-12/rootfs/opt/bitnami/scripts/elasticsearch-env.sh +++ b/bitnami/elasticsearch/9.1/debian-12/rootfs/opt/bitnami/scripts/elasticsearch-env.sh @@ -80,7 +80,9 @@ elasticsearch_env_vars=( ELASTICSEARCH_HTTP_TLS_NODE_KEY_LOCATION ELASTICSEARCH_HTTP_TLS_CA_CERT_LOCATION ELASTICSEARCH_ENABLE_FIPS_MODE + ELASTICSEARCH_PASSWD_HASH_ALGORITHM ELASTICSEARCH_KEYS + ES_JAVA_HOME DB_MINIMUM_MANAGER_NODES ) for env_var in "${elasticsearch_env_vars[@]}"; do @@ -253,6 +255,11 @@ export DB_HTTP_TLS_NODE_KEY_LOCATION="$ELASTICSEARCH_HTTP_TLS_NODE_KEY_LOCATION" export ELASTICSEARCH_HTTP_TLS_CA_CERT_LOCATION="${ELASTICSEARCH_HTTP_TLS_CA_CERT_LOCATION:-$DB_CA_CERT_LOCATION}" export DB_HTTP_TLS_CA_CERT_LOCATION="$ELASTICSEARCH_HTTP_TLS_CA_CERT_LOCATION" export ELASTICSEARCH_ENABLE_FIPS_MODE="${ELASTICSEARCH_ENABLE_FIPS_MODE:-false}" +export ELASTICSEARCH_PASSWD_HASH_ALGORITHM="${ELASTICSEARCH_PASSWD_HASH_ALGORITHM:-}" export ELASTICSEARCH_KEYS="${ELASTICSEARCH_KEYS:-}" +export JAVA_HOME="${BITNAMI_ROOT_DIR}/java" +export ES_JAVA_HOME="${ES_JAVA_HOME:-${JAVA_HOME}}" +export ES_JAVA_OPTS="${ES_JAVA_OPTS:-} ${JAVA_TOOL_OPTIONS:-}" +export CLI_JAVA_OPTS="${CLI_JAVA_OPTS:-} ${JAVA_TOOL_OPTIONS:-}" # Custom environment variables may be defined below diff --git a/bitnami/elasticsearch/9.1/debian-12/rootfs/opt/bitnami/scripts/elasticsearch/run.sh b/bitnami/elasticsearch/9.1/debian-12/rootfs/opt/bitnami/scripts/elasticsearch/run.sh index 596b43e4aa0d..b5f0c22bf507 100755 --- a/bitnami/elasticsearch/9.1/debian-12/rootfs/opt/bitnami/scripts/elasticsearch/run.sh +++ b/bitnami/elasticsearch/9.1/debian-12/rootfs/opt/bitnami/scripts/elasticsearch/run.sh @@ -20,10 +20,6 @@ set -o pipefail EXEC=$(command -v elasticsearch) ARGS=("-p" "$DB_PID_FILE") [[ -z "${DB_EXTRA_FLAGS:-}" ]] || ARGS=("${ARGS[@]}" "${DB_EXTRA_FLAGS[@]}") -# JAVA_HOME to be deprecated, see warning: -# warning: usage of JAVA_HOME is deprecated, use ES_JAVA_HOME -export JAVA_HOME=/opt/bitnami/java -export ES_JAVA_HOME=/opt/bitnami/java ARGS+=("$@") diff --git a/bitnami/elasticsearch/9.1/debian-12/rootfs/opt/bitnami/scripts/libelasticsearch.sh b/bitnami/elasticsearch/9.1/debian-12/rootfs/opt/bitnami/scripts/libelasticsearch.sh index c461af2a6952..d4881b30d015 100644 --- a/bitnami/elasticsearch/9.1/debian-12/rootfs/opt/bitnami/scripts/libelasticsearch.sh +++ b/bitnami/elasticsearch/9.1/debian-12/rootfs/opt/bitnami/scripts/libelasticsearch.sh @@ -752,13 +752,14 @@ elasticsearch_initialize() { [[ -n "$DB_ACTION_DESTRUCTIVE_REQUIRES_NAME" ]] && elasticsearch_conf_set action.destructive_requires_name "$(is_boolean_yes "$DB_ACTION_DESTRUCTIVE_REQUIRES_NAME" && echo "true" || echo "false")" # X-Pack settings. elasticsearch_conf_set xpack.security.enabled "$(is_boolean_yes "$DB_ENABLE_SECURITY" && echo "true" || echo "false")" + ! is_empty_value "$ELASTICSEARCH_PASSWD_HASH_ALGORITHM" && elasticsearch_conf_set xpack.security.authc.password_hashing.algorithm "$ELASTICSEARCH_PASSWD_HASH_ALGORITHM" ! is_empty_value "$DB_PASSWORD" && elasticsearch_set_key_value "bootstrap.password" "$DB_PASSWORD" if is_boolean_yes "$DB_ENABLE_SECURITY"; then is_boolean_yes "$DB_ENABLE_REST_TLS" && elasticsearch_http_tls_configuration ! is_boolean_yes "$DB_SKIP_TRANSPORT_TLS" && elasticsearch_transport_tls_configuration if is_boolean_yes "$ELASTICSEARCH_ENABLE_FIPS_MODE"; then elasticsearch_conf_set xpack.security.fips_mode.enabled "true" - elasticsearch_conf_set xpack.security.authc.password_hashing.algorithm "pbkdf2" + elasticsearch_conf_set xpack.security.authc.password_hashing.algorithm "${ELASTICSEARCH_PASSWD_HASH_ALGORITHM:-pbkdf2}" fi fi # Latest Elasticseach releases install x-pack-ml by default. Since we have faced some issues with this library on certain platforms, diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md index c1d2dd208d88..b3677e2c3708 100644 --- a/bitnami/elasticsearch/README.md +++ b/bitnami/elasticsearch/README.md @@ -246,31 +246,36 @@ docker-compose up -d | `ELASTICSEARCH_HTTP_TLS_NODE_KEY_LOCATION` | Path to PEM node key for HTTP TLS. | `$DB_NODE_KEY_LOCATION` | | `ELASTICSEARCH_HTTP_TLS_CA_CERT_LOCATION` | Path to CA certificate for HTTP TLS. | `$DB_CA_CERT_LOCATION` | | `ELASTICSEARCH_ENABLE_FIPS_MODE` | Enables FIPS mode of operation | `false` | +| `ELASTICSEARCH_PASSWD_HASH_ALGORITHM` | Password hashing algorithm | `nil` | | `ELASTICSEARCH_KEYS` | Comma-separated list of key=value to be added to the Elasticsearch keystore | `nil` | +| `ES_JAVA_HOME` | Elasticsearch supported Java installation folder. | `${JAVA_HOME}` | #### Read-only environment variables -| Name | Description | Value | -|-------------------------------------|-----------------------------------------------------------------|------------------------------------| -| `DB_FLAVOR` | Database flavor. Valid values: `elasticsearch` or `opensearch`. | `elasticsearch` | -| `ELASTICSEARCH_VOLUME_DIR` | Persistence base directory | `/bitnami/elasticsearch` | -| `ELASTICSEARCH_BASE_DIR` | Elasticsearch installation directory | `/opt/bitnami/elasticsearch` | -| `ELASTICSEARCH_CONF_DIR` | Elasticsearch configuration directory | `${DB_BASE_DIR}/config` | -| `ELASTICSEARCH_DEFAULT_CONF_DIR` | Elasticsearch default configuration directory | `${DB_BASE_DIR}/config.default` | -| `ELASTICSEARCH_LOGS_DIR` | Elasticsearch logs directory | `${DB_BASE_DIR}/logs` | -| `ELASTICSEARCH_PLUGINS_DIR` | Elasticsearch plugins directory | `${DB_BASE_DIR}/plugins` | -| `ELASTICSEARCH_DEFAULT_PLUGINS_DIR` | Elasticsearch default plugins directory | `${DB_BASE_DIR}/plugins.default` | -| `ELASTICSEARCH_DATA_DIR` | Elasticsearch data directory | `${DB_VOLUME_DIR}/data` | -| `ELASTICSEARCH_TMP_DIR` | Elasticsearch temporary directory | `${DB_BASE_DIR}/tmp` | -| `ELASTICSEARCH_BIN_DIR` | Elasticsearch executables directory | `${DB_BASE_DIR}/bin` | -| `ELASTICSEARCH_MOUNTED_PLUGINS_DIR` | Directory where plugins are mounted | `${DB_VOLUME_DIR}/plugins` | -| `ELASTICSEARCH_CONF_FILE` | Path to Elasticsearch configuration file | `${DB_CONF_DIR}/elasticsearch.yml` | -| `ELASTICSEARCH_LOG_FILE` | Path to the Elasticsearch log file | `${DB_LOGS_DIR}/elasticsearch.log` | -| `ELASTICSEARCH_PID_FILE` | Path to the Elasticsearch pid file | `${DB_TMP_DIR}/elasticsearch.pid` | -| `ELASTICSEARCH_INITSCRIPTS_DIR` | Path to the Elasticsearch container init scripts directory | `/docker-entrypoint-initdb.d` | -| `ELASTICSEARCH_DAEMON_USER` | Elasticsearch system user | `elasticsearch` | -| `ELASTICSEARCH_DAEMON_GROUP` | Elasticsearch system group | `elasticsearch` | -| `ELASTICSEARCH_USERNAME` | Username of the Elasticsearch superuser. | `elastic` | +| Name | Description | Value | +|-------------------------------------|-----------------------------------------------------------------|---------------------------------------------| +| `DB_FLAVOR` | Database flavor. Valid values: `elasticsearch` or `opensearch`. | `elasticsearch` | +| `ELASTICSEARCH_VOLUME_DIR` | Persistence base directory | `/bitnami/elasticsearch` | +| `ELASTICSEARCH_BASE_DIR` | Elasticsearch installation directory | `/opt/bitnami/elasticsearch` | +| `ELASTICSEARCH_CONF_DIR` | Elasticsearch configuration directory | `${DB_BASE_DIR}/config` | +| `ELASTICSEARCH_DEFAULT_CONF_DIR` | Elasticsearch default configuration directory | `${DB_BASE_DIR}/config.default` | +| `ELASTICSEARCH_LOGS_DIR` | Elasticsearch logs directory | `${DB_BASE_DIR}/logs` | +| `ELASTICSEARCH_PLUGINS_DIR` | Elasticsearch plugins directory | `${DB_BASE_DIR}/plugins` | +| `ELASTICSEARCH_DEFAULT_PLUGINS_DIR` | Elasticsearch default plugins directory | `${DB_BASE_DIR}/plugins.default` | +| `ELASTICSEARCH_DATA_DIR` | Elasticsearch data directory | `${DB_VOLUME_DIR}/data` | +| `ELASTICSEARCH_TMP_DIR` | Elasticsearch temporary directory | `${DB_BASE_DIR}/tmp` | +| `ELASTICSEARCH_BIN_DIR` | Elasticsearch executables directory | `${DB_BASE_DIR}/bin` | +| `ELASTICSEARCH_MOUNTED_PLUGINS_DIR` | Directory where plugins are mounted | `${DB_VOLUME_DIR}/plugins` | +| `ELASTICSEARCH_CONF_FILE` | Path to Elasticsearch configuration file | `${DB_CONF_DIR}/elasticsearch.yml` | +| `ELASTICSEARCH_LOG_FILE` | Path to the Elasticsearch log file | `${DB_LOGS_DIR}/elasticsearch.log` | +| `ELASTICSEARCH_PID_FILE` | Path to the Elasticsearch pid file | `${DB_TMP_DIR}/elasticsearch.pid` | +| `ELASTICSEARCH_INITSCRIPTS_DIR` | Path to the Elasticsearch container init scripts directory | `/docker-entrypoint-initdb.d` | +| `ELASTICSEARCH_DAEMON_USER` | Elasticsearch system user | `elasticsearch` | +| `ELASTICSEARCH_DAEMON_GROUP` | Elasticsearch system group | `elasticsearch` | +| `ELASTICSEARCH_USERNAME` | Username of the Elasticsearch superuser. | `elastic` | +| `JAVA_HOME` | Java installation folder. | `${BITNAMI_ROOT_DIR}/java` | +| `ES_JAVA_OPTS` | Elasticsearch supported Java options. | `${ES_JAVA_OPTS:-} ${JAVA_TOOL_OPTIONS:-}` | +| `CLI_JAVA_OPTS` | Elasticsearch CLI supported Java options. | `${CLI_JAVA_OPTS:-} ${JAVA_TOOL_OPTIONS:-}` | When you start the elasticsearch image, you can adjust the configuration of the instance by passing one or more environment variables either on the docker-compose file or on the `docker run` command line. If you want to add a new environment variable: