From c5eeb5b397bebe71bd2eabbc97337a737f52497e Mon Sep 17 00:00:00 2001 From: David Gomez Date: Wed, 2 Apr 2025 12:49:48 +0200 Subject: [PATCH] [bitnami/fluent-bit] Remove support for fluent-bit < 4 Signed-off-by: David Gomez --- bitnami/fluent-bit/{2 => 3}/README.md | 0 bitnami/fluent-bit/3/debian-12/Dockerfile | 58 ------------------- .../fluent-bit/3/debian-12/docker-compose.yml | 8 --- .../opt/bitnami/.bitnami_components.json | 8 --- .../opt/bitnami/licenses/licenses.txt | 2 - .../prebuildfs/usr/sbin/install_packages | 27 --------- .../debian-12/prebuildfs/usr/sbin/run-script | 24 -------- bitnami/fluent-bit/3/debian-12/tags-info.yaml | 5 -- 8 files changed, 132 deletions(-) rename bitnami/fluent-bit/{2 => 3}/README.md (100%) delete mode 100644 bitnami/fluent-bit/3/debian-12/Dockerfile delete mode 100644 bitnami/fluent-bit/3/debian-12/docker-compose.yml delete mode 100644 bitnami/fluent-bit/3/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json delete mode 100644 bitnami/fluent-bit/3/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt delete mode 100755 bitnami/fluent-bit/3/debian-12/prebuildfs/usr/sbin/install_packages delete mode 100755 bitnami/fluent-bit/3/debian-12/prebuildfs/usr/sbin/run-script delete mode 100644 bitnami/fluent-bit/3/debian-12/tags-info.yaml diff --git a/bitnami/fluent-bit/2/README.md b/bitnami/fluent-bit/3/README.md similarity index 100% rename from bitnami/fluent-bit/2/README.md rename to bitnami/fluent-bit/3/README.md diff --git a/bitnami/fluent-bit/3/debian-12/Dockerfile b/bitnami/fluent-bit/3/debian-12/Dockerfile deleted file mode 100644 index 1e0fbe51cec37..0000000000000 --- a/bitnami/fluent-bit/3/debian-12/Dockerfile +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright Broadcom, Inc. All Rights Reserved. -# SPDX-License-Identifier: APACHE-2.0 - -FROM docker.io/bitnami/minideb:bookworm - -ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" -ARG TARGETARCH - -LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ - org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-03-25T16:51:16Z" \ - org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ - org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/fluent-bit/README.md" \ - org.opencontainers.image.ref.name="3.2.10-debian-12-r0" \ - org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/fluent-bit" \ - org.opencontainers.image.title="fluent-bit" \ - org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="3.2.10" - -ENV HOME="/" \ - OS_ARCH="${TARGETARCH:-amd64}" \ - OS_FLAVOUR="debian-12" \ - OS_NAME="linux" - -COPY prebuildfs / -SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] -# Install required system packages and dependencies -RUN install_packages ca-certificates curl libcap2 libgcc-s1 libgcrypt20 libgpg-error0 liblz4-1 liblzma5 libsasl2-2 libssl3 libsystemd0 libyaml-0-2 libzstd1 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ - COMPONENTS=( \ - "fluent-bit-3.2.10-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 "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz.sha256" -O ; \ - fi ; \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \ - rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ - done -RUN apt-get autoremove --purge -y curl && \ - apt-get update && apt-get upgrade -y && \ - apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives -RUN chmod g+rwX /opt/bitnami -RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true -RUN chown -R 1001:1001 /opt/bitnami/fluent-bit - -ENV APP_VERSION="3.2.10" \ - BITNAMI_APP_NAME="fluent-bit" \ - PATH="/opt/bitnami/fluent-bit/bin:$PATH" - -EXPOSE 2020 - -WORKDIR /opt/bitnami/fluent-bit -USER 1001 -ENTRYPOINT [ "fluent-bit" ] -CMD [ "-c", "/opt/bitnami/fluent-bit/conf/fluent-bit.conf" ] diff --git a/bitnami/fluent-bit/3/debian-12/docker-compose.yml b/bitnami/fluent-bit/3/debian-12/docker-compose.yml deleted file mode 100644 index 4fd0087435319..0000000000000 --- a/bitnami/fluent-bit/3/debian-12/docker-compose.yml +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Broadcom, Inc. All Rights Reserved. -# SPDX-License-Identifier: APACHE-2.0 - -services: - fluent-bit: - image: docker.io/bitnami/fluent-bit:3 - ports: - - '2020:2020' diff --git a/bitnami/fluent-bit/3/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/fluent-bit/3/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index 45ce09269d824..0000000000000 --- a/bitnami/fluent-bit/3/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "fluent-bit": { - "arch": "amd64", - "distro": "debian-12", - "type": "NAMI", - "version": "3.2.10-0" - } -} \ No newline at end of file diff --git a/bitnami/fluent-bit/3/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/fluent-bit/3/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index 76956b38e82c6..0000000000000 --- a/bitnami/fluent-bit/3/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt +++ /dev/null @@ -1,2 +0,0 @@ -Bitnami containers ship with software bundles. You can find the licenses under: -/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/fluent-bit/3/debian-12/prebuildfs/usr/sbin/install_packages b/bitnami/fluent-bit/3/debian-12/prebuildfs/usr/sbin/install_packages deleted file mode 100755 index ccce248b2d141..0000000000000 --- a/bitnami/fluent-bit/3/debian-12/prebuildfs/usr/sbin/install_packages +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Copyright Broadcom, Inc. All Rights Reserved. -# SPDX-License-Identifier: APACHE-2.0 -set -eu - -n=0 -max=2 -export DEBIAN_FRONTEND=noninteractive - -until [ $n -gt $max ]; do - set +e - ( - apt-get update -qq && - apt-get install -y --no-install-recommends "$@" - ) - CODE=$? - set -e - if [ $CODE -eq 0 ]; then - break - fi - if [ $n -eq $max ]; then - exit $CODE - fi - echo "apt failed, retrying" - n=$(($n + 1)) -done -apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/fluent-bit/3/debian-12/prebuildfs/usr/sbin/run-script b/bitnami/fluent-bit/3/debian-12/prebuildfs/usr/sbin/run-script deleted file mode 100755 index 0e07c9038dfde..0000000000000 --- a/bitnami/fluent-bit/3/debian-12/prebuildfs/usr/sbin/run-script +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# Copyright Broadcom, Inc. All Rights Reserved. -# SPDX-License-Identifier: APACHE-2.0 -set -u - -if [ $# -eq 0 ]; then - >&2 echo "No arguments provided" - exit 1 -fi - -script=$1 -exit_code="${2:-96}" -fail_if_not_present="${3:-n}" - -if test -f "$script"; then - sh $script - - if [ $? -ne 0 ]; then - exit $((exit_code)) - fi -elif [ "$fail_if_not_present" = "y" ]; then - >&2 echo "script not found: $script" - exit 127 -fi diff --git a/bitnami/fluent-bit/3/debian-12/tags-info.yaml b/bitnami/fluent-bit/3/debian-12/tags-info.yaml deleted file mode 100644 index 9f734ba7e9f1f..0000000000000 --- a/bitnami/fluent-bit/3/debian-12/tags-info.yaml +++ /dev/null @@ -1,5 +0,0 @@ -rolling-tags: -- "3" -- 3-debian-12 -- 3.2.10 -- latest