mirror of
https://github.com/bitnami/containers.git
synced 2026-03-27 23:38:05 +08:00
[bitnami/logstash] Release 9.1.3-debian-12-r0 (#85628)
Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
This commit is contained in:
@@ -8,15 +8,14 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
|
|||||||
ARG LOGSTASH_PLUGINS
|
ARG LOGSTASH_PLUGINS
|
||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
|
|
||||||
LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
|
LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
|
||||||
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
|
org.opencontainers.image.created="2025-08-28T18:11:37Z" \
|
||||||
org.opencontainers.image.created="2025-08-13T07:16:01Z" \
|
|
||||||
org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
|
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.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" \
|
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/logstash" \
|
||||||
org.opencontainers.image.title="logstash" \
|
org.opencontainers.image.title="logstash" \
|
||||||
org.opencontainers.image.vendor="Broadcom, Inc." \
|
org.opencontainers.image.vendor="Broadcom, Inc." \
|
||||||
org.opencontainers.image.version="9.1.2"
|
org.opencontainers.image.version="9.1.3"
|
||||||
|
|
||||||
ENV HOME="/" \
|
ENV HOME="/" \
|
||||||
OS_ARCH="${TARGETARCH:-amd64}" \
|
OS_ARCH="${TARGETARCH:-amd64}" \
|
||||||
@@ -31,9 +30,9 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
|
|||||||
DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
|
DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
|
||||||
mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
|
mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
|
||||||
COMPONENTS=( \
|
COMPONENTS=( \
|
||||||
"yq-4.47.1-1-linux-${OS_ARCH}-debian-12" \
|
"yq-4.47.1-2-linux-${OS_ARCH}-debian-12" \
|
||||||
"java-17.0.16-12-0-linux-${OS_ARCH}-debian-12" \
|
"java-17.0.16-12-0-linux-${OS_ARCH}-debian-12" \
|
||||||
"logstash-9.1.2-0-linux-${OS_ARCH}-debian-12" \
|
"logstash-9.1.3-0-linux-${OS_ARCH}-debian-12" \
|
||||||
) ; \
|
) ; \
|
||||||
for COMPONENT in "${COMPONENTS[@]}"; do \
|
for COMPONENT in "${COMPONENTS[@]}"; do \
|
||||||
if [ ! -f "${COMPONENT}.tar.gz" ]; then \
|
if [ ! -f "${COMPONENT}.tar.gz" ]; then \
|
||||||
@@ -53,8 +52,9 @@ RUN uninstall_packages curl
|
|||||||
COPY rootfs /
|
COPY rootfs /
|
||||||
RUN /opt/bitnami/scripts/java/postunpack.sh
|
RUN /opt/bitnami/scripts/java/postunpack.sh
|
||||||
RUN /opt/bitnami/scripts/logstash/postunpack.sh
|
RUN /opt/bitnami/scripts/logstash/postunpack.sh
|
||||||
ENV APP_VERSION="9.1.2" \
|
ENV APP_VERSION="9.1.3" \
|
||||||
BITNAMI_APP_NAME="logstash" \
|
BITNAMI_APP_NAME="logstash" \
|
||||||
|
IMAGE_REVISION="0" \
|
||||||
JAVA_HOME="/opt/bitnami/java" \
|
JAVA_HOME="/opt/bitnami/java" \
|
||||||
PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/logstash/bin:$PATH"
|
PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/logstash/bin:$PATH"
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
{
|
|
||||||
"java": {
|
|
||||||
"arch": "amd64",
|
|
||||||
"distro": "debian-12",
|
|
||||||
"type": "NAMI",
|
|
||||||
"version": "17.0.16-12-0"
|
|
||||||
},
|
|
||||||
"logstash": {
|
|
||||||
"arch": "amd64",
|
|
||||||
"distro": "debian-12",
|
|
||||||
"type": "NAMI",
|
|
||||||
"version": "9.1.2-0"
|
|
||||||
},
|
|
||||||
"yq": {
|
|
||||||
"arch": "amd64",
|
|
||||||
"distro": "debian-12",
|
|
||||||
"type": "NAMI",
|
|
||||||
"version": "4.47.1-1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -142,80 +142,6 @@ EOF
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
########################
|
|
||||||
# Remove a cron configuration file for a given service
|
|
||||||
# Arguments:
|
|
||||||
# $1 - Service name
|
|
||||||
# Returns:
|
|
||||||
# None
|
|
||||||
#########################
|
|
||||||
remove_cron_conf() {
|
|
||||||
local service_name="${1:?service name is missing}"
|
|
||||||
local cron_conf_dir="/etc/monit/conf.d"
|
|
||||||
rm -f "${cron_conf_dir}/${service_name}"
|
|
||||||
}
|
|
||||||
|
|
||||||
########################
|
|
||||||
# Generate a monit configuration file for a given service
|
|
||||||
# Arguments:
|
|
||||||
# $1 - Service name
|
|
||||||
# $2 - Pid file
|
|
||||||
# $3 - Start command
|
|
||||||
# $4 - Stop command
|
|
||||||
# Flags:
|
|
||||||
# --disable - Whether to disable the monit configuration
|
|
||||||
# Returns:
|
|
||||||
# None
|
|
||||||
#########################
|
|
||||||
generate_monit_conf() {
|
|
||||||
local service_name="${1:?service name is missing}"
|
|
||||||
local pid_file="${2:?pid file is missing}"
|
|
||||||
local start_command="${3:?start command is missing}"
|
|
||||||
local stop_command="${4:?stop command is missing}"
|
|
||||||
local monit_conf_dir="/etc/monit/conf.d"
|
|
||||||
local disabled="no"
|
|
||||||
|
|
||||||
# Parse optional CLI flags
|
|
||||||
shift 4
|
|
||||||
while [[ "$#" -gt 0 ]]; do
|
|
||||||
case "$1" in
|
|
||||||
--disable)
|
|
||||||
disabled="yes"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Invalid command line flag ${1}" >&2
|
|
||||||
return 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
|
|
||||||
is_boolean_yes "$disabled" && conf_suffix=".disabled"
|
|
||||||
mkdir -p "$monit_conf_dir"
|
|
||||||
cat > "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
|
|
||||||
# Copyright Broadcom, Inc. All Rights Reserved.
|
|
||||||
# SPDX-License-Identifier: APACHE-2.0
|
|
||||||
|
|
||||||
check process ${service_name}
|
|
||||||
with pidfile "${pid_file}"
|
|
||||||
start program = "${start_command}" with timeout 90 seconds
|
|
||||||
stop program = "${stop_command}" with timeout 90 seconds
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
########################
|
|
||||||
# Remove a monit configuration file for a given service
|
|
||||||
# Arguments:
|
|
||||||
# $1 - Service name
|
|
||||||
# Returns:
|
|
||||||
# None
|
|
||||||
#########################
|
|
||||||
remove_monit_conf() {
|
|
||||||
local service_name="${1:?service name is missing}"
|
|
||||||
local monit_conf_dir="/etc/monit/conf.d"
|
|
||||||
rm -f "${monit_conf_dir}/${service_name}.conf"
|
|
||||||
}
|
|
||||||
|
|
||||||
########################
|
########################
|
||||||
# Generate a logrotate configuration file
|
# Generate a logrotate configuration file
|
||||||
# Arguments:
|
# Arguments:
|
||||||
|
|||||||
@@ -139,41 +139,6 @@ web_server_stop() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
########################
|
|
||||||
# Restart web server
|
|
||||||
# Globals:
|
|
||||||
# *
|
|
||||||
# Arguments:
|
|
||||||
# None
|
|
||||||
# Returns:
|
|
||||||
# None
|
|
||||||
#########################
|
|
||||||
web_server_restart() {
|
|
||||||
info "Restarting $(web_server_type)"
|
|
||||||
if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
|
|
||||||
systemctl restart "bitnami.$(web_server_type).service"
|
|
||||||
else
|
|
||||||
"${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
########################
|
|
||||||
# Reload web server
|
|
||||||
# Globals:
|
|
||||||
# *
|
|
||||||
# Arguments:
|
|
||||||
# None
|
|
||||||
# Returns:
|
|
||||||
# None
|
|
||||||
#########################
|
|
||||||
web_server_reload() {
|
|
||||||
if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
|
|
||||||
systemctl reload "bitnami.$(web_server_type).service"
|
|
||||||
else
|
|
||||||
"${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
########################
|
########################
|
||||||
# Ensure a web server application configuration exists (i.e. Apache virtual host format or NGINX server block)
|
# Ensure a web server application configuration exists (i.e. Apache virtual host format or NGINX server block)
|
||||||
# It serves as a wrapper for the specific web server function
|
# It serves as a wrapper for the specific web server function
|
||||||
@@ -429,48 +394,3 @@ web_server_update_app_configuration() {
|
|||||||
web_server_execute "$web_server" "${web_server}_update_app_configuration" "${args[@]}"
|
web_server_execute "$web_server" "${web_server}_update_app_configuration" "${args[@]}"
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
########################
|
|
||||||
# Enable loading page, which shows users that the initialization process is not yet completed
|
|
||||||
# Globals:
|
|
||||||
# *
|
|
||||||
# Arguments:
|
|
||||||
# None
|
|
||||||
# Returns:
|
|
||||||
# None
|
|
||||||
#########################
|
|
||||||
web_server_enable_loading_page() {
|
|
||||||
ensure_web_server_app_configuration_exists "__loading" --hosts "_default_" \
|
|
||||||
--apache-additional-configuration "
|
|
||||||
# Show a HTTP 503 Service Unavailable page by default
|
|
||||||
RedirectMatch 503 ^/$
|
|
||||||
# Show index.html if server is answering with 404 Not Found or 503 Service Unavailable status codes
|
|
||||||
ErrorDocument 404 /index.html
|
|
||||||
ErrorDocument 503 /index.html" \
|
|
||||||
--nginx-additional-configuration "
|
|
||||||
# Show a HTTP 503 Service Unavailable page by default
|
|
||||||
location / {
|
|
||||||
return 503;
|
|
||||||
}
|
|
||||||
# Show index.html if server is answering with 404 Not Found or 503 Service Unavailable status codes
|
|
||||||
error_page 404 @installing;
|
|
||||||
error_page 503 @installing;
|
|
||||||
location @installing {
|
|
||||||
rewrite ^(.*)$ /index.html break;
|
|
||||||
}"
|
|
||||||
web_server_reload
|
|
||||||
}
|
|
||||||
|
|
||||||
########################
|
|
||||||
# Enable loading page, which shows users that the initialization process is not yet completed
|
|
||||||
# Globals:
|
|
||||||
# *
|
|
||||||
# Arguments:
|
|
||||||
# None
|
|
||||||
# Returns:
|
|
||||||
# None
|
|
||||||
#########################
|
|
||||||
web_server_disable_install_page() {
|
|
||||||
ensure_web_server_app_configuration_not_exists "__loading"
|
|
||||||
web_server_reload
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user