Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-04-05 00:37:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/logstash] Release 7.17.10-debian-11-r7 (#35227)

Browse Source 
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
2023-05-25 01:50:18 +02:00
committed by GitHub
parent b0cf7c284b
commit cf1992e205
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bitnami/logstash/7/debian-11/Dockerfile
View File

@@ -5,10 +5,10 @@ ARG LOGSTASH_PLUGINS
ARG TARGETARCH
LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
org.opencontainers.image.created="2023-05-21T16:48:12Z" \
org.opencontainers.image.created="2023-05-24T23:19:45Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="7.17.10-debian-11-r6" \
org.opencontainers.image.ref.name="7.17.10-debian-11-r7" \
org.opencontainers.image.title="logstash" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="7.17.10"
@@ -25,7 +25,7 @@ RUN install_packages ca-certificates curl procps zlib1g
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
COMPONENTS=( \
"java-17.0.7-7-2-linux-${OS_ARCH}-debian-11" \
"yq-4.33.3-1-linux-${OS_ARCH}-debian-11" \
"yq-4.34.1-0-linux-${OS_ARCH}-debian-11" \
"logstash-7.17.10-1-linux-${OS_ARCH}-debian-11" \
) && \
for COMPONENT in "${COMPONENTS[@]}"; do \

2
bitnami/logstash/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
View File

@@ -15,6 +15,6 @@
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "4.33.3-1"
"version": "4.34.1-0"
}
}

15
bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/liblogstash.sh
View File

@@ -282,19 +282,18 @@ logstash_initialize() {
# Skip further configuration if Logstash pipeline configuration was passed as a string
[[ -n "$LOGSTASH_PIPELINE_CONF_STRING" ]] && return
if [[ -n "$LOGSTASH_PIPELINE_CONF_FILENAME" && -e "${LOGSTASH_MOUNTED_PIPELINE_CONF_DIR}/${LOGSTASH_PIPELINE_CONF_FILENAME}" ]]; then
info "Detected mounted '${LOGSTASH_PIPELINE_CONF_FILENAME}' pipeline configuration file"
cp -L "${LOGSTASH_MOUNTED_PIPELINE_CONF_DIR}/${LOGSTASH_PIPELINE_CONF_FILENAME}" "$LOGSTASH_PIPELINE_CONF_DIR"
elif ! is_mounted_dir_empty "$LOGSTASH_MOUNTED_PIPELINE_CONF_DIR"; then
if ! is_mounted_dir_empty "$LOGSTASH_MOUNTED_PIPELINE_CONF_DIR"; then
info "Detected mounted pipeline configuration files"
cp -Lr "$LOGSTASH_MOUNTED_PIPELINE_CONF_DIR"/*.conf "$LOGSTASH_PIPELINE_CONF_DIR"
cp -Lr "$LOGSTASH_MOUNTED_PIPELINE_CONF_DIR"/* "$LOGSTASH_PIPELINE_CONF_DIR"
elif [[ -e "${LOGSTASH_MOUNTED_CONF_DIR}/${LOGSTASH_PIPELINE_CONF_FILENAME}" ]]; then
# Support for legacy configuration before configurations were separated into 'config' and 'pipeline'
warn "Detected mounted '${LOGSTASH_MOUNTED_CONF_DIR}/${LOGSTASH_PIPELINE_CONF_FILENAME}' pipeline configuration file in legacy directory."
warn "Support for this configuration may be deprecated in a future version of this image. Please mount the file to '${LOGSTASH_MOUNTED_PIPELINE_CONF_DIR}/${LOGSTASH_PIPELINE_CONF_FILENAME}' instead."
cp -Lr "$LOGSTASH_MOUNTED_CONF_DIR"/*.conf "$LOGSTASH_PIPELINE_CONF_DIR"
else
warn "Support for this configuration may be deprecated in a future version of this image. Please mount the pipeline files to '${LOGSTASH_MOUNTED_PIPELINE_CONF_DIR}' instead."
cp -Lr "${LOGSTASH_MOUNTED_CONF_DIR}/${LOGSTASH_PIPELINE_CONF_FILENAME}" "$LOGSTASH_PIPELINE_CONF_DIR"
elif is_dir_empty "$LOGSTASH_PIPELINE_CONF_DIR"; then
logstash_create_sample_pipeline_config_file
else
info "Detected existing files in '${LOGSTASH_PIPELINE_CONF_DIR}', skipping sample pipeline generation"
fi
}