From ca536b6a06560fccb82262f003a696062ded4dfb Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami.bot@broadcom.com>
Date: Fri, 6 Jun 2025 03:01:30 +0200
Subject: [PATCH] [bitnami/harbor-adapter-trivy] Release 2.13.1-debian-12-r2
 (#82010)

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
---
 .../2/debian-12/Dockerfile                    |  7 ++---
 .../opt/bitnami/.bitnami_components.json      |  2 +-
 .../prebuildfs/usr/sbin/uninstall_packages    | 26 +++++++++++++++++++
 3 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100755 bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/usr/sbin/uninstall_packages

diff --git a/bitnami/harbor-adapter-trivy/2/debian-12/Dockerfile b/bitnami/harbor-adapter-trivy/2/debian-12/Dockerfile
index bc9448657c88..dc17e6e261a3 100644
--- a/bitnami/harbor-adapter-trivy/2/debian-12/Dockerfile
+++ b/bitnami/harbor-adapter-trivy/2/debian-12/Dockerfile
@@ -8,10 +8,10 @@ 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:45:51Z" \
+      org.opencontainers.image.created="2025-06-06T00:00:56Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/harbor-adapter-trivy/README.md" \
-      org.opencontainers.image.ref.name="2.13.1-debian-12-r1" \
+      org.opencontainers.image.ref.name="2.13.1-debian-12-r2" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/harbor-adapter-trivy" \
       org.opencontainers.image.title="harbor-adapter-trivy" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -28,7 +28,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "harbor-adapter-trivy-2.13.1-0-linux-${OS_ARCH}-debian-12" \
+      "harbor-adapter-trivy-2.13.1-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -43,6 +43,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
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/harbor-adapter-trivy/postunpack.sh
diff --git a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 7ff6b5cef11a..1ec93bcd2236 100644
--- a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "2.13.1-0"
+        "version": "2.13.1-1"
     }
 }
\ No newline at end of file
diff --git a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/usr/sbin/uninstall_packages
new file mode 100755
index 000000000000..615c430e4e68
--- /dev/null
+++ b/bitnami/harbor-adapter-trivy/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