From 9e157b8f99e48683e8051ee802b04ba88bfd27fb Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Hernandez Date: Wed, 22 Jun 2022 10:51:14 +0000 Subject: [PATCH] Remove debian-10 directory Signed-off-by: Carlos Rodriguez Hernandez --- bitnami/haproxy-intel/2/debian-10/Dockerfile | 35 ------------------- .../2/debian-10/docker-compose.yml | 4 --- .../opt/bitnami/.bitnami_components.json | 23 ------------ .../opt/bitnami/licenses/licenses.txt | 3 -- .../prebuildfs/usr/sbin/install_packages | 24 ------------- 5 files changed, 89 deletions(-) delete mode 100644 bitnami/haproxy-intel/2/debian-10/Dockerfile delete mode 100644 bitnami/haproxy-intel/2/debian-10/docker-compose.yml delete mode 100644 bitnami/haproxy-intel/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json delete mode 100644 bitnami/haproxy-intel/2/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt delete mode 100755 bitnami/haproxy-intel/2/debian-10/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/haproxy-intel/2/debian-10/Dockerfile b/bitnami/haproxy-intel/2/debian-10/Dockerfile deleted file mode 100644 index adf732fc0608..000000000000 --- a/bitnami/haproxy-intel/2/debian-10/Dockerfile +++ /dev/null @@ -1,35 +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 libssl1.1 procps tar wget -RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/qatengine-0.6.12-0-linux-amd64-debian-10.tar.gz && \ - echo "4d158fe5d91dca3c4224f382a36ba21a7d14436239accf0f27625d2ac1543806 /tmp/bitnami/pkg/cache/qatengine-0.6.12-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ - tar -zxf /tmp/bitnami/pkg/cache/qatengine-0.6.12-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ - rm -rf /tmp/bitnami/pkg/cache/qatengine-0.6.12-0-linux-amd64-debian-10.tar.gz -RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/haproxy-dataplaneapi-2.5.3-0-linux-amd64-debian-10.tar.gz && \ - echo "9d992f5f710cb6358d675abb27b32fa80ad8390b38a77fc31fa36bba4f3f3235 /tmp/bitnami/pkg/cache/haproxy-dataplaneapi-2.5.3-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ - tar -zxf /tmp/bitnami/pkg/cache/haproxy-dataplaneapi-2.5.3-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ - rm -rf /tmp/bitnami/pkg/cache/haproxy-dataplaneapi-2.5.3-0-linux-amd64-debian-10.tar.gz -RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/haproxy-2.6.0-1-linux-amd64-debian-10.tar.gz && \ - echo "ced21de5deef64e9a604529999d49dca3d66a3c07ee9a3a37c6ddb449d95469d /tmp/bitnami/pkg/cache/haproxy-2.6.0-1-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ - tar -zxf /tmp/bitnami/pkg/cache/haproxy-2.6.0-1-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ - rm -rf /tmp/bitnami/pkg/cache/haproxy-2.6.0-1-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 ln -s /opt/bitnami/common/lib/engines-1.1/* /usr/lib/x86_64-linux-gnu/engines-1.1/ - -ENV APP_VERSION="2.6.0" \ - BITNAMI_APP_NAME="haproxy-intel" \ - PATH="/opt/bitnami/haproxy-dataplaneapi/bin:/opt/bitnami/haproxy/sbin:$PATH" - -USER 1001 -ENTRYPOINT [ "/opt/bitnami/haproxy/sbin/haproxy" ] -CMD [ "-f", "/bitnami/haproxy/conf/haproxy.cfg" ] diff --git a/bitnami/haproxy-intel/2/debian-10/docker-compose.yml b/bitnami/haproxy-intel/2/debian-10/docker-compose.yml deleted file mode 100644 index 18e9b9d27aae..000000000000 --- a/bitnami/haproxy-intel/2/debian-10/docker-compose.yml +++ /dev/null @@ -1,4 +0,0 @@ -version: '2' -services: - haproxy: - image: docker.io/bitnami/haproxy-intel:2 diff --git a/bitnami/haproxy-intel/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/haproxy-intel/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index 025880d15f5e..000000000000 --- a/bitnami/haproxy-intel/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "haproxy": { - "arch": "amd64", - "digest": "ced21de5deef64e9a604529999d49dca3d66a3c07ee9a3a37c6ddb449d95469d", - "distro": "debian-10", - "type": "NAMI", - "version": "2.6.0-1" - }, - "haproxy-dataplaneapi": { - "arch": "amd64", - "digest": "9d992f5f710cb6358d675abb27b32fa80ad8390b38a77fc31fa36bba4f3f3235", - "distro": "debian-10", - "type": "NAMI", - "version": "2.5.3-0" - }, - "qatengine": { - "arch": "amd64", - "digest": "4d158fe5d91dca3c4224f382a36ba21a7d14436239accf0f27625d2ac1543806", - "distro": "debian-10", - "type": "NAMI", - "version": "0.6.12-0" - } -} \ No newline at end of file diff --git a/bitnami/haproxy-intel/2/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/haproxy-intel/2/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index c76ba31f3b8a..000000000000 --- a/bitnami/haproxy-intel/2/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/haproxy-intel/2/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/haproxy-intel/2/debian-10/prebuildfs/usr/sbin/install_packages deleted file mode 100755 index c9577647443b..000000000000 --- a/bitnami/haproxy-intel/2/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