diff --git a/bitnami/logstash/9.1/debian-12/Dockerfile b/bitnami/logstash/9.1/debian-12/Dockerfile index 264f65234eac..f2b3973d1315 100644 --- a/bitnami/logstash/9.1/debian-12/Dockerfile +++ b/bitnami/logstash/9.1/debian-12/Dockerfile @@ -9,7 +9,7 @@ ARG LOGSTASH_PLUGINS ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-10-06T15:55:56Z" \ + org.opencontainers.image.created="2025-10-20T19:12:03Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/logstash/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/logstash" \ @@ -30,7 +30,7 @@ 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" \ + "yq-4.48.1-1-linux-${OS_ARCH}-debian-12" \ "java-17.0.16-12-1-linux-${OS_ARCH}-debian-12" \ "logstash-9.1.5-0-linux-${OS_ARCH}-debian-12" \ ) ; \ @@ -54,7 +54,7 @@ RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/logstash/postunpack.sh ENV APP_VERSION="9.1.5" \ BITNAMI_APP_NAME="logstash" \ - IMAGE_REVISION="0" \ + IMAGE_REVISION="1" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/logstash/bin:$PATH" diff --git a/bitnami/logstash/9.1/debian-12/rootfs/opt/bitnami/scripts/logstash-env.sh b/bitnami/logstash/9.1/debian-12/rootfs/opt/bitnami/scripts/logstash-env.sh index e058c33e5ff6..718dbd34b29f 100644 --- a/bitnami/logstash/9.1/debian-12/rootfs/opt/bitnami/scripts/logstash-env.sh +++ b/bitnami/logstash/9.1/debian-12/rootfs/opt/bitnami/scripts/logstash-env.sh @@ -49,6 +49,7 @@ logstash_env_vars=( LOGSTASH_ENABLE_ELASTICSEARCH_OUTPUT LOGSTASH_ELASTICSEARCH_HOST LOGSTASH_ELASTICSEARCH_PORT_NUMBER + LS_JAVA_HOME LOGSTASH_CONF_FILENAME LOGSTASH_CONF_STRING LOGSTASH_EXTRA_ARGS @@ -118,6 +119,8 @@ export LOGSTASH_ELASTICSEARCH_PORT_NUMBER="${LOGSTASH_ELASTICSEARCH_PORT_NUMBER: # Default JVM configuration export JAVA_HOME="${BITNAMI_ROOT_DIR}/java" +export LS_JAVA_HOME="${LS_JAVA_HOME:-${JAVA_HOME}}" +export LS_JAVA_OPTS="${LS_JAVA_OPTS:-} ${JAVA_TOOL_OPTIONS:-}" # Other parameters export PATH="${LOGSTASH_BIN_DIR}:${JAVA_HOME}/bin:${BITNAMI_ROOT_DIR}/common/bin:${PATH}" diff --git a/bitnami/logstash/9.1/debian-12/rootfs/opt/bitnami/scripts/logstash/run.sh b/bitnami/logstash/9.1/debian-12/rootfs/opt/bitnami/scripts/logstash/run.sh index 01ab241e6e99..dbbf9456839f 100755 --- a/bitnami/logstash/9.1/debian-12/rootfs/opt/bitnami/scripts/logstash/run.sh +++ b/bitnami/logstash/9.1/debian-12/rootfs/opt/bitnami/scripts/logstash/run.sh @@ -32,10 +32,6 @@ declare -a extra_args=() read -r -a extra_args <<< "$LOGSTASH_EXTRA_FLAGS" [[ "${#extra_args[@]}" -gt 0 ]] && cmd+=("${extra_args[@]}") -# JAVA_HOME to be deprecated, see warning: -# warning: usage of JAVA_HOME is deprecated, use LS_JAVA_HOME -export LS_JAVA_HOME=/opt/bitnami/java - info "** Starting Logstash **" if am_i_root; then exec_as_user "$LOGSTASH_DAEMON_USER" "${cmd[@]}" diff --git a/bitnami/logstash/README.md b/bitnami/logstash/README.md index cc8efdc2401f..0ee50e374f2b 100644 --- a/bitnami/logstash/README.md +++ b/bitnami/logstash/README.md @@ -162,6 +162,7 @@ docker run -d -p 8080:8080 bitnami/logstash:latest | `LOGSTASH_ENABLE_ELASTICSEARCH_OUTPUT` | Whether to output to an Elasticsearch server | `no` | | `LOGSTASH_ELASTICSEARCH_HOST` | Elasticsearch server hostname | `elasticsearch` | | `LOGSTASH_ELASTICSEARCH_PORT_NUMBER` | Elasticsearch server port | `9200` | +| `LS_JAVA_HOME` | Logstash supported Java installation folder. | `${JAVA_HOME}` | #### Read-only environment variables @@ -182,6 +183,7 @@ docker run -d -p 8080:8080 bitnami/logstash:latest | `LOGSTASH_DAEMON_USER` | Logstash system user | `logstash` | | `LOGSTASH_DAEMON_GROUP` | Logstash system group | `logstash` | | `JAVA_HOME` | Java installation folder. | `${BITNAMI_ROOT_DIR}/java` | +| `LS_JAVA_OPTS` | Logstash supported Java options. | `${LS_JAVA_OPTS:-} ${JAVA_TOOL_OPTIONS:-}` | ### Using a configuration string