From 2c15477bd08e31fbe90656e99b0e0d9f3aa582f0 Mon Sep 17 00:00:00 2001 From: Cori Avila <42420333+corico44@users.noreply.github.com> Date: Fri, 1 Sep 2023 18:29:24 +0200 Subject: [PATCH] [bitnami/fluent-bit] Deprecate FluentBit 1 (#46953) Signed-off-by: Cori Avila --- bitnami/fluent-bit/1/debian-11/Dockerfile | 55 ------------------- .../fluent-bit/1/debian-11/docker-compose.yml | 10 ---- .../opt/bitnami/.bitnami_components.json | 8 --- .../opt/bitnami/licenses/licenses.txt | 2 - .../prebuildfs/usr/sbin/install_packages | 27 --------- .../debian-11/prebuildfs/usr/sbin/run-script | 24 -------- bitnami/fluent-bit/1/debian-11/tags-info.yaml | 4 -- 7 files changed, 130 deletions(-) delete mode 100644 bitnami/fluent-bit/1/debian-11/Dockerfile delete mode 100644 bitnami/fluent-bit/1/debian-11/docker-compose.yml delete mode 100644 bitnami/fluent-bit/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json delete mode 100644 bitnami/fluent-bit/1/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt delete mode 100755 bitnami/fluent-bit/1/debian-11/prebuildfs/usr/sbin/install_packages delete mode 100755 bitnami/fluent-bit/1/debian-11/prebuildfs/usr/sbin/run-script delete mode 100644 bitnami/fluent-bit/1/debian-11/tags-info.yaml diff --git a/bitnami/fluent-bit/1/debian-11/Dockerfile b/bitnami/fluent-bit/1/debian-11/Dockerfile deleted file mode 100644 index f2c8bc8912d6..000000000000 --- a/bitnami/fluent-bit/1/debian-11/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -FROM docker.io/bitnami/minideb:bullseye - -ARG TARGETARCH - -LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ - org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-08-30T23:59:41Z" \ - org.opencontainers.image.description="Application packaged by VMware, Inc" \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.9.10-debian-11-r123" \ - org.opencontainers.image.title="fluent-bit" \ - org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.9.10" - -ENV HOME="/" \ - OS_ARCH="${TARGETARCH:-amd64}" \ - OS_FLAVOUR="debian-11" \ - OS_NAME="linux" - -COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# Install required system packages and dependencies -RUN install_packages ca-certificates curl libgcc-s1 libgcrypt20 libgpg-error0 liblz4-1 liblzma5 libsasl2-2 libssl1.1 libsystemd0 libyaml-0-2 libzstd1 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - COMPONENTS=( \ - "fluent-bit-1.9.10-8-linux-${OS_ARCH}-debian-11" \ - ) && \ - for COMPONENT in "${COMPONENTS[@]}"; do \ - if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${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 --wildcards '*/files' && \ - 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 chown -R 1001:1001 /opt/bitnami/fluent-bit - -ENV APP_VERSION="1.9.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/1/debian-11/docker-compose.yml b/bitnami/fluent-bit/1/debian-11/docker-compose.yml deleted file mode 100644 index 0994c7c8bad1..000000000000 --- a/bitnami/fluent-bit/1/debian-11/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -version: '2' - -services: - fluent-bit: - image: docker.io/bitnami/fluent-bit:1 - ports: - - '2020:2020' diff --git a/bitnami/fluent-bit/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/fluent-bit/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index 17831ce56300..000000000000 --- a/bitnami/fluent-bit/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "fluent-bit": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "1.9.10-8" - } -} \ No newline at end of file diff --git a/bitnami/fluent-bit/1/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/fluent-bit/1/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index 76956b38e82c..000000000000 --- a/bitnami/fluent-bit/1/debian-11/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/1/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/fluent-bit/1/debian-11/prebuildfs/usr/sbin/install_packages deleted file mode 100755 index acbc3173208c..000000000000 --- a/bitnami/fluent-bit/1/debian-11/prebuildfs/usr/sbin/install_packages +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Copyright VMware, Inc. -# 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/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/fluent-bit/1/debian-11/prebuildfs/usr/sbin/run-script deleted file mode 100755 index 4ca0f897277e..000000000000 --- a/bitnami/fluent-bit/1/debian-11/prebuildfs/usr/sbin/run-script +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# Copyright VMware, Inc. -# 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/1/debian-11/tags-info.yaml b/bitnami/fluent-bit/1/debian-11/tags-info.yaml deleted file mode 100644 index b07378d9c38c..000000000000 --- a/bitnami/fluent-bit/1/debian-11/tags-info.yaml +++ /dev/null @@ -1,4 +0,0 @@ -rolling-tags: -- "1" -- 1-debian-11 -- 1.9.10