From 814aa14427cb0f3267a4e6aa897db2db73b76eaa Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Hernandez Date: Wed, 22 Jun 2022 10:50:48 +0000 Subject: [PATCH] Remove debian-10 directory Signed-off-by: Carlos Rodriguez Hernandez --- bitnami/fluent-bit/1/debian-10/Dockerfile | 30 ------------------- .../fluent-bit/1/debian-10/docker-compose.yml | 7 ----- .../opt/bitnami/.bitnami_components.json | 9 ------ .../opt/bitnami/licenses/licenses.txt | 3 -- .../prebuildfs/usr/sbin/install_packages | 24 --------------- 5 files changed, 73 deletions(-) delete mode 100644 bitnami/fluent-bit/1/debian-10/Dockerfile delete mode 100644 bitnami/fluent-bit/1/debian-10/docker-compose.yml delete mode 100644 bitnami/fluent-bit/1/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json delete mode 100644 bitnami/fluent-bit/1/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt delete mode 100755 bitnami/fluent-bit/1/debian-10/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/fluent-bit/1/debian-10/Dockerfile b/bitnami/fluent-bit/1/debian-10/Dockerfile deleted file mode 100644 index bd222115f84a..000000000000 --- a/bitnami/fluent-bit/1/debian-10/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM docker.io/bitnami/minideb:buster -LABEL maintainer "Bitnami " - -ENV HOME="/" \ - OS_ARCH="amd64" \ - OS_FLAVOUR="debian-10" \ - OS_NAME="linux" - -COPY prebuildfs / -# Install required system packages and dependencies -RUN install_packages ca-certificates curl gzip libc6 libgcc1 libgcrypt20 libgpg-error0 liblz4-1 liblzma5 libsasl2-2 libssl1.1 libsystemd0 procps tar wget zlib1g -RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/fluent-bit-1.9.3-0-linux-amd64-debian-10.tar.gz && \ - echo "145cb44479f7d216210f6c7c931cc47c676c9ebb788a22015d52409a76f699ba /tmp/bitnami/pkg/cache/fluent-bit-1.9.3-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ - tar -zxf /tmp/bitnami/pkg/cache/fluent-bit-1.9.3-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ - rm -rf /tmp/bitnami/pkg/cache/fluent-bit-1.9.3-0-linux-amd64-debian-10.tar.gz -RUN apt-get update && apt-get upgrade -y && \ - rm -r /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.3" \ - 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-10/docker-compose.yml b/bitnami/fluent-bit/1/debian-10/docker-compose.yml deleted file mode 100644 index 13acdbd26a38..000000000000 --- a/bitnami/fluent-bit/1/debian-10/docker-compose.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: '2' - -services: - fluent-bit: - image: docker.io/bitnami/fluent-bit:1 - ports: - - '2020:2020' diff --git a/bitnami/fluent-bit/1/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/fluent-bit/1/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index 18e6f090bd76..000000000000 --- a/bitnami/fluent-bit/1/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "fluent-bit": { - "arch": "amd64", - "digest": "145cb44479f7d216210f6c7c931cc47c676c9ebb788a22015d52409a76f699ba", - "distro": "debian-10", - "type": "NAMI", - "version": "1.9.3-0" - } -} \ No newline at end of file diff --git a/bitnami/fluent-bit/1/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/fluent-bit/1/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index c76ba31f3b8a..000000000000 --- a/bitnami/fluent-bit/1/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt +++ /dev/null @@ -1,3 +0,0 @@ -Bitnami containers ship with software bundles. You can find the licenses under: -/opt/bitnami/nami/COPYING -/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/fluent-bit/1/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/fluent-bit/1/debian-10/prebuildfs/usr/sbin/install_packages deleted file mode 100755 index c9577647443b..000000000000 --- a/bitnami/fluent-bit/1/debian-10/prebuildfs/usr/sbin/install_packages +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -set -e -set -u -export DEBIAN_FRONTEND=noninteractive -n=0 -max=2 -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 -rm -r /var/lib/apt/lists /var/cache/apt/archives