From f5f455f36fb06772584eef3d789340fb9dd301c4 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami.bot@broadcom.com>
Date: Sun, 29 Jun 2025 18:56:31 +0200
Subject: [PATCH] [bitnami/zipkin] Release 3.5.1-debian-12-r3 (#82788)

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
---
 bitnami/zipkin/3/debian-12/Dockerfile         |  8 +++---
 .../prebuildfs/usr/sbin/uninstall_packages    | 26 +++++++++++++++++++
 bitnami/zipkin/3/debian-12/tags-info.yaml     |  8 +++---
 3 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100755 bitnami/zipkin/3/debian-12/prebuildfs/usr/sbin/uninstall_packages

diff --git a/bitnami/zipkin/3/debian-12/Dockerfile b/bitnami/zipkin/3/debian-12/Dockerfile
index 6ef9ebac8304..9357c9f8009b 100644
--- a/bitnami/zipkin/3/debian-12/Dockerfile
+++ b/bitnami/zipkin/3/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-30T16:18:31Z" \
+      org.opencontainers.image.created="2025-06-29T16:42:18Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/zipkin/README.md" \
-      org.opencontainers.image.ref.name="3.5.1-debian-12-r2" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/zipkin" \
       org.opencontainers.image.title="zipkin" \
       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-21.0.7-9-0-linux-${OS_ARCH}-debian-12" \
       "zipkin-3.5.1-0-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 useradd -r -u 1001 -g root zipkin
 RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
+RUN uninstall_packages curl
 
 ENV APP_VERSION="3.5.1" \
     BITNAMI_APP_NAME="zipkin" \
diff --git a/bitnami/zipkin/3/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/zipkin/3/debian-12/prebuildfs/usr/sbin/uninstall_packages
new file mode 100755
index 000000000000..615c430e4e68
--- /dev/null
+++ b/bitnami/zipkin/3/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/zipkin/3/debian-12/tags-info.yaml b/bitnami/zipkin/3/debian-12/tags-info.yaml
index dab7b67022aa..7190c3df5fe0 100644
--- a/bitnami/zipkin/3/debian-12/tags-info.yaml
+++ b/bitnami/zipkin/3/debian-12/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
-- "3"
-- 3-debian-12
-- 3.5.1
-- latest
+  - "3"
+  - 3-debian-12
+  - 3.5.1
+  - latest