From be3d40a1cf96bd090c318a5a17c80d0a2d1d77ff Mon Sep 17 00:00:00 2001 From: David Gomez Date: Thu, 23 Jan 2025 11:19:02 +0100 Subject: [PATCH] [bitnami/envoy] Remove branch 1.32 (#76500) Signed-off-by: David Gomez --- bitnami/envoy/1.32/README.md | 5 ++ bitnami/envoy/1.32/debian-12/Dockerfile | 55 ------------------ .../envoy/1.32/debian-12/docker-compose.yml | 6 -- .../1.32/debian-12/examples/frontend.yaml | 58 ------------------- .../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/envoy/1.32/debian-12/tags-info.yaml | 5 -- 9 files changed, 5 insertions(+), 185 deletions(-) create mode 100644 bitnami/envoy/1.32/README.md delete mode 100644 bitnami/envoy/1.32/debian-12/Dockerfile delete mode 100644 bitnami/envoy/1.32/debian-12/docker-compose.yml delete mode 100644 bitnami/envoy/1.32/debian-12/examples/frontend.yaml delete mode 100644 bitnami/envoy/1.32/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json delete mode 100644 bitnami/envoy/1.32/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt delete mode 100755 bitnami/envoy/1.32/debian-12/prebuildfs/usr/sbin/install_packages delete mode 100755 bitnami/envoy/1.32/debian-12/prebuildfs/usr/sbin/run-script delete mode 100644 bitnami/envoy/1.32/debian-12/tags-info.yaml diff --git a/bitnami/envoy/1.32/README.md b/bitnami/envoy/1.32/README.md new file mode 100644 index 0000000000000..5237e148ec0d9 --- /dev/null +++ b/bitnami/envoy/1.32/README.md @@ -0,0 +1,5 @@ +# Only latest stable branch maintained in the free Bitnami catalog + +Starting December 10th 2024, only the latest stable branch of any container will receive updates in the free Bitnami catalog. To access up-to-date releases for all upstream-supported branches, consider upgrading to Bitnami Premium. Previous versions already released will not be deleted. They are still available to pull from DockerHub. + +Please check the Bitnami Premium page in our partner [Arrow Electronics](https://www.arrow.com/globalecs/na/vendors/bitnami?utm_source=GitHub&utm_medium=containers) for more information. diff --git a/bitnami/envoy/1.32/debian-12/Dockerfile b/bitnami/envoy/1.32/debian-12/Dockerfile deleted file mode 100644 index d360eb0105745..0000000000000 --- a/bitnami/envoy/1.32/debian-12/Dockerfile +++ /dev/null @@ -1,55 +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-01-17T23:13:23Z" \ - org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ - org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/envoy/README.md" \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.32.3-debian-12-r1" \ - org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/envoy" \ - org.opencontainers.image.title="envoy" \ - org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="1.32.3" - -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 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ - COMPONENTS=( \ - "envoy-1.32.3-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 --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 find / -perm /6000 -type f -exec chmod a-s {} \; || true - -ENV APP_VERSION="1.32.3" \ - BITNAMI_APP_NAME="envoy" \ - PATH="/opt/bitnami/envoy/bin:$PATH" - -USER 1001 -ENTRYPOINT [ "/opt/bitnami/envoy/bin/envoy" ] -CMD [ "-c", "/opt/bitnami/envoy/conf/envoy.yaml" ] diff --git a/bitnami/envoy/1.32/debian-12/docker-compose.yml b/bitnami/envoy/1.32/debian-12/docker-compose.yml deleted file mode 100644 index 2b9522bc249d5..0000000000000 --- a/bitnami/envoy/1.32/debian-12/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright Broadcom, Inc. All Rights Reserved. -# SPDX-License-Identifier: APACHE-2.0 - -services: - envoy: - image: docker.io/bitnami/envoy:1.32 diff --git a/bitnami/envoy/1.32/debian-12/examples/frontend.yaml b/bitnami/envoy/1.32/debian-12/examples/frontend.yaml deleted file mode 100644 index 0803f3c363620..0000000000000 --- a/bitnami/envoy/1.32/debian-12/examples/frontend.yaml +++ /dev/null @@ -1,58 +0,0 @@ -admin: - access_log_path: /tmp/admin_access.log - address: - socket_address: { address: 127.0.0.1, port_value: 8081 } - -static_resources: - listeners: - - name: listener_0 - address: - socket_address: { address: 0.0.0.0, port_value: 8080 } - filter_chains: - - filters: - - name: envoy.filters.network.http_connection_manager - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager - stat_prefix: ingress_http - codec_type: AUTO - route_config: - name: local_route - virtual_hosts: - - name: local_service - domains: ["*"] - routes: - - match: { prefix: "/nginx" } - route: { cluster: service1, prefix_rewrite: "/" } - - match: { prefix: "/apache" } - route: { cluster: service2, prefix_rewrite: "/" } - http_filters: - - name: envoy.filters.http.router - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router - clusters: - - name: service1 - connect_timeout: 0.25s - type: STRICT_DNS - lb_policy: ROUND_ROBIN - load_assignment: - cluster_name: some_service - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: service1 - port_value: 8080 - - name: service2 - connect_timeout: 0.25s - type: STRICT_DNS - lb_policy: ROUND_ROBIN - load_assignment: - cluster_name: some_service - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: service2 - port_value: 8080 diff --git a/bitnami/envoy/1.32/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/envoy/1.32/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index 995e0b3b5a1fe..0000000000000 --- a/bitnami/envoy/1.32/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "envoy": { - "arch": "amd64", - "distro": "debian-12", - "type": "NAMI", - "version": "1.32.3-0" - } -} \ No newline at end of file diff --git a/bitnami/envoy/1.32/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/envoy/1.32/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index 76956b38e82c6..0000000000000 --- a/bitnami/envoy/1.32/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/envoy/1.32/debian-12/prebuildfs/usr/sbin/install_packages b/bitnami/envoy/1.32/debian-12/prebuildfs/usr/sbin/install_packages deleted file mode 100755 index ccce248b2d141..0000000000000 --- a/bitnami/envoy/1.32/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/envoy/1.32/debian-12/prebuildfs/usr/sbin/run-script b/bitnami/envoy/1.32/debian-12/prebuildfs/usr/sbin/run-script deleted file mode 100755 index 0e07c9038dfde..0000000000000 --- a/bitnami/envoy/1.32/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/envoy/1.32/debian-12/tags-info.yaml b/bitnami/envoy/1.32/debian-12/tags-info.yaml deleted file mode 100644 index 6964a16551394..0000000000000 --- a/bitnami/envoy/1.32/debian-12/tags-info.yaml +++ /dev/null @@ -1,5 +0,0 @@ -rolling-tags: -- "1.32" -- 1.32-debian-12 -- 1.32.3 -- latest