Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-16 06:49:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/logstash] Release 8.12.2-debian-12-r1 (#63441)

Browse Source 
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
2024-02-28 16:40:39 +01:00
committed by GitHub
parent 0630d9904f
commit a4c62b73a3
5 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bitnami/logstash/8/debian-12/Dockerfile
View File

@@ -9,10 +9,10 @@ ARG TARGETARCH
LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
org.opencontainers.image.created="2024-02-22T18:15:17Z" \
org.opencontainers.image.created="2024-02-28T14:59:28Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="8.12.2-debian-12-r0" \
org.opencontainers.image.ref.name="8.12.2-debian-12-r1" \
org.opencontainers.image.title="logstash" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="8.12.2"
@@ -28,7 +28,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
RUN install_packages ca-certificates curl procps zlib1g
RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
COMPONENTS=( \
"yq-4.41.1-0-linux-${OS_ARCH}-debian-12" \
"yq-4.42.1-0-linux-${OS_ARCH}-debian-12" \
"java-17.0.10-13-2-linux-${OS_ARCH}-debian-12" \
"logstash-8.12.2-0-linux-${OS_ARCH}-debian-12" \
) ; \

2
bitnami/logstash/8/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
View File

@@ -15,6 +15,6 @@
"arch": "amd64",
"distro": "debian-12",
"type": "NAMI",
"version": "4.41.1-0"
"version": "4.42.1-0"
}
}

2
bitnami/logstash/8/debian-12/rootfs/opt/bitnami/scripts/logstash-env.sh
View File

@@ -69,7 +69,9 @@ unset logstash_env_vars
# Paths
export LOGSTASH_BASE_DIR="/opt/bitnami/logstash"
export LOGSTASH_CONF_DIR="${LOGSTASH_BASE_DIR}/config"
export LOGSTASH_DEFAULT_CONF_DIR="${LOGSTASH_BASE_DIR}/config.default"
export LOGSTASH_PIPELINE_CONF_DIR="${LOGSTASH_BASE_DIR}/pipeline"
export LOGSTASH_DEFAULT_PIPELINE_CONF_DIR="${LOGSTASH_BASE_DIR}/pipeline.default"
export LOGSTASH_BIN_DIR="${LOGSTASH_BASE_DIR}/bin"
export LOGSTASH_CONF_FILE="${LOGSTASH_CONF_DIR}/logstash.yml"
LOGSTASH_PIPELINE_CONF_FILENAME="${LOGSTASH_PIPELINE_CONF_FILENAME:-"${LOGSTASH_CONF_FILENAME:-}"}"

13
bitnami/logstash/8/debian-12/rootfs/opt/bitnami/scripts/logstash/entrypoint.sh
View File

@@ -19,6 +19,19 @@ set -o pipefail
print_welcome_page
# We add the copy from default config in the entrypoint to not break users
# bypassing the setup.sh logic. If the file already exists do not overwrite (in
# case someone mounts a configuration file in /opt/bitnami/logstash/config
# /opt/bitnami/logstash/pipeline)
if ! is_dir_empty "$LOGSTASH_DEFAULT_CONF_DIR"; then
debug "Copying files from $LOGSTASH_DEFAULT_CONF_DIR to $LOGSTASH_CONF_DIR"
cp -nr "$LOGSTASH_DEFAULT_CONF_DIR"/. "$LOGSTASH_CONF_DIR"
fi
if ! is_dir_empty "$LOGSTASH_DEFAULT_PIPELINE_CONF_DIR"; then
debug "Copying files from $LOGSTASH_DEFAULT_PIPELINE_CONF_DIR to $LOGSTASH_PIPELINE_CONF_DIR"
cp -nr "$LOGSTASH_DEFAULT_PIPELINE_CONF_DIR"/. "$LOGSTASH_PIPELINE_CONF_DIR"
fi
if [[ "$*" = *"/opt/bitnami/scripts/logstash/run.sh"* ]]; then
info "** Starting Logstash setup **"
/opt/bitnami/scripts/logstash/setup.sh

17
bitnami/logstash/8/debian-12/rootfs/opt/bitnami/scripts/logstash/postunpack.sh
View File

@@ -19,7 +19,7 @@ set -o pipefail
info "Creating Logstash daemon user"
ensure_user_exists "$LOGSTASH_DAEMON_USER" --group "$LOGSTASH_DAEMON_GROUP"
for dir in "$LOGSTASH_BASE_DIR/vendor/bundle/jruby" "$LOGSTASH_CONF_DIR" "$LOGSTASH_PIPELINE_CONF_DIR" "$LOGSTASH_MOUNTED_CONF_DIR" "$LOGSTASH_MOUNTED_PIPELINE_CONF_DIR" "$LOGSTASH_VOLUME_DIR" "$LOGSTASH_DATA_DIR"; do
for dir in "$LOGSTASH_BASE_DIR/vendor/bundle/jruby" "$LOGSTASH_CONF_DIR" "$LOGSTASH_PIPELINE_CONF_DIR" "$LOGSTASH_DEFAULT_CONF_DIR" "$LOGSTASH_DEFAULT_PIPELINE_CONF_DIR" "$LOGSTASH_MOUNTED_CONF_DIR" "$LOGSTASH_MOUNTED_PIPELINE_CONF_DIR" "$LOGSTASH_VOLUME_DIR" "$LOGSTASH_DATA_DIR"; do
ensure_dir_exists "$dir"
configure_permissions_ownership "$dir" -d "775" -f "664" -u "$LOGSTASH_DAEMON_USER" -g "root"
done
@@ -54,3 +54,18 @@ rootLogger.appenderRef.console.ref = \${sys:ls.log.format}_console
EOF
logstash_install_plugins
# As the gems directory depends on the jruby version, we need to create a symlink /opt/bitnami/logstash/gems
# so we can mount an emptydir in readOnlyRootFilesystem
ln -s /opt/bitnami/logstash/vendor/bundle/jruby/*/gems /opt/bitnami/logstash/gems
# Copy all initially generated configuration files to the default directory
# (this is to avoid breaking when entrypoint is being overridden)
if ! is_dir_empty "$LOGSTASH_CONF_DIR"; then
cp -r "$LOGSTASH_CONF_DIR"/* "$LOGSTASH_DEFAULT_CONF_DIR"
chmod o+r -R "$LOGSTASH_DEFAULT_CONF_DIR"
fi
if ! is_dir_empty "$LOGSTASH_PIPELINE_CONF_DIR"; then
cp -r "$LOGSTASH_PIPELINE_CONF_DIR"/* "$LOGSTASH_DEFAULT_PIPELINE_CONF_DIR"
chmod o+r -R "$LOGSTASH_DEFAULT_PIPELINE_CONF_DIR"
fi