From bc773497d0932be528c8ecbc09fe0bc0da8b86d3 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 11 Jun 2026 04:14:42 +0200 Subject: [PATCH] [bitnami/fluentd] Release 1.19.2-debian-12-r10 (#94666) Signed-off-by: Bitnami Bot --- bitnami/fluentd/1/debian-12/Dockerfile | 10 +++--- ....4.9-3-linux-amd64-debian-12.tar.gz.sha256 | 1 - ....4.9-3-linux-arm64-debian-12.tar.gz.sha256 | 1 - ....4.9-5-linux-amd64-debian-12.tar.gz.sha256 | 1 + ....4.9-5-linux-arm64-debian-12.tar.gz.sha256 | 1 + .../prebuildfs/opt/bitnami/scripts/libos.sh | 2 +- .../opt/bitnami/scripts/libvalidations.sh | 2 +- .../opt/bitnami/scripts/libversion.sh | 33 +++++++++++++++++++ 8 files changed, 42 insertions(+), 9 deletions(-) delete mode 100644 bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/checksums/ruby-3.4.9-3-linux-amd64-debian-12.tar.gz.sha256 delete mode 100644 bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/checksums/ruby-3.4.9-3-linux-arm64-debian-12.tar.gz.sha256 create mode 100644 bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/checksums/ruby-3.4.9-5-linux-amd64-debian-12.tar.gz.sha256 create mode 100644 bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/checksums/ruby-3.4.9-5-linux-arm64-debian-12.tar.gz.sha256 diff --git a/bitnami/fluentd/1/debian-12/Dockerfile b/bitnami/fluentd/1/debian-12/Dockerfile index 7ae713d68226..32a12f1f0788 100644 --- a/bitnami/fluentd/1/debian-12/Dockerfile +++ b/bitnami/fluentd/1/debian-12/Dockerfile @@ -3,11 +3,11 @@ FROM docker.io/bitnami/minideb:bookworm -ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" +ARG DOWNLOADS_URL="https://downloads.bitnami.com/files/stacksmith" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-05-29T18:50:56Z" \ + org.opencontainers.image.created="2026-06-11T01:08:05Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/fluentd/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/fluentd" \ @@ -28,12 +28,12 @@ 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=( \ - "ruby-3.4.9-3-linux-${OS_ARCH}-debian-12" \ + "ruby-3.4.9-5-linux-${OS_ARCH}-debian-12" \ "fluentd-1.19.2-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ fi ; \ sha256sum -c "/opt/bitnami/checksums/${COMPONENT}.tar.gz.sha256" ; \ tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \ @@ -51,7 +51,7 @@ RUN /opt/bitnami/scripts/fluentd/postunpack.sh ENV APP_VERSION="1.19.2" \ BITNAMI_APP_NAME="fluentd" \ GEM_HOME="/opt/bitnami/fluentd" \ - IMAGE_REVISION="9" \ + IMAGE_REVISION="10" \ PATH="/opt/bitnami/ruby/bin:/opt/bitnami/fluentd/bin:$PATH" EXPOSE 5140 24224 diff --git a/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/checksums/ruby-3.4.9-3-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/checksums/ruby-3.4.9-3-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index e0c94ee36e90..000000000000 --- a/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/checksums/ruby-3.4.9-3-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -c918e07e4ea39e841b52eca79f27c262c412860e0164566477c3ce24841c4116 ruby-3.4.9-3-linux-amd64-debian-12.tar.gz diff --git a/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/checksums/ruby-3.4.9-3-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/checksums/ruby-3.4.9-3-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 2157eafc3185..000000000000 --- a/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/checksums/ruby-3.4.9-3-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -41ccd319fa60a236693c9325dd5591ce734ac689e08603780fa2de891f146047 ruby-3.4.9-3-linux-arm64-debian-12.tar.gz diff --git a/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/checksums/ruby-3.4.9-5-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/checksums/ruby-3.4.9-5-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..6778e9ba59ba --- /dev/null +++ b/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/checksums/ruby-3.4.9-5-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +2a708cb9e4f4c4b6f016a6e86886204de4cb8e6c797d92cec9c99d8457211475 ruby-3.4.9-5-linux-amd64-debian-12.tar.gz diff --git a/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/checksums/ruby-3.4.9-5-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/checksums/ruby-3.4.9-5-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..30693adbc9f2 --- /dev/null +++ b/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/checksums/ruby-3.4.9-5-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +5f2cac1081fab94d1a0d82a3fa008bf50f3a709ec0add00f854da70d4d2f5364 ruby-3.4.9-5-linux-arm64-debian-12.tar.gz diff --git a/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b..2d3c3bdb5f4a 100644 --- a/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh @@ -170,7 +170,7 @@ ensure_user_exists() { if [[ -n "$home" ]]; then mkdir -p "$home" usermod -d "$home" "$user" >/dev/null 2>&1 - configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" + configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" -n fi } diff --git a/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c..3a996383cfab 100644 --- a/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -20,7 +20,7 @@ ######################### is_int() { local -r int="${1:?missing value}" - if [[ "$int" =~ ^-?[0-9]+ ]]; then + if [[ "$int" =~ ^-?[0-9]+$ ]]; then true else false diff --git a/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -49,3 +49,36 @@ get_sematic_version () { fi fi } + +######################## +# Compares two semantic versions +# Arguments: +# $1 - version1: first version to compare +# $2 - version2: second version to compare +# Returns: +# -1 if version1 is less than version2 +# 0 if version1 is equal to version2 +# 1 if version1 is greater than version2 +######################### +compare_semantic_versions() { + local version1="${1:?version1 is required}" + local version2="${2:?version2 is required}" + local major1 major2 minor1 minor2 patch1 patch2 + + major1="$(get_sematic_version "$version1" 1)" + major2="$(get_sematic_version "$version2" 1)" + minor1="$(get_sematic_version "$version1" 2)" + minor2="$(get_sematic_version "$version2" 2)" + patch1="$(get_sematic_version "$version1" 3)" + patch2="$(get_sematic_version "$version2" 3)" + + if [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -eq "$patch2" ]]; then + echo "0" + elif [[ "$major1" -lt "$major2" ]] || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -lt "$minor2" ]]; } || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -lt "$patch2" ]]; }; then + echo "-1" + else + echo "1" + fi +}