diff --git a/bitnami/cassandra-exporter/2/debian-12/Dockerfile b/bitnami/cassandra-exporter/2/debian-12/Dockerfile index f61c671a6855..8bfe6f06b56a 100644 --- a/bitnami/cassandra-exporter/2/debian-12/Dockerfile +++ b/bitnami/cassandra-exporter/2/debian-12/Dockerfile @@ -8,10 +8,9 @@ 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-05-30T14:19:52Z" \ + org.opencontainers.image.created="2025-06-29T14:38:20Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/cassandra-exporter/README.md" \ - org.opencontainers.image.ref.name="2.3.8-debian-12-r48" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/cassandra-exporter" \ org.opencontainers.image.title="cassandra-exporter" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -26,7 +25,9 @@ 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 zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ +RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ + DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \ + mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ "jre-17.0.15-10-0-linux-${OS_ARCH}-debian-12" \ "cassandra-exporter-2.3.8-7-linux-${OS_ARCH}-debian-12" \ @@ -44,6 +45,7 @@ RUN 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 uninstall_packages curl ENV APP_VERSION="2.3.8" \ BITNAMI_APP_NAME="cassandra-exporter" \ diff --git a/bitnami/cassandra-exporter/2/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/cassandra-exporter/2/debian-12/prebuildfs/usr/sbin/uninstall_packages new file mode 100755 index 000000000000..615c430e4e68 --- /dev/null +++ b/bitnami/cassandra-exporter/2/debian-12/prebuildfs/usr/sbin/uninstall_packages @@ -0,0 +1,26 @@ +#!/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 autoremove --purge -y "$@" + ) + 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/cassandra-exporter/2/debian-12/tags-info.yaml b/bitnami/cassandra-exporter/2/debian-12/tags-info.yaml index 91e10beb9f2a..263d0eef147e 100644 --- a/bitnami/cassandra-exporter/2/debian-12/tags-info.yaml +++ b/bitnami/cassandra-exporter/2/debian-12/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: -- "2" -- 2-debian-12 -- 2.3.8 -- latest + - "2" + - 2-debian-12 + - 2.3.8 + - latest