From 64cb55cf8fd33b85e26d5a3eb69315d1b5c53be3 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami.bot@broadcom.com>
Date: Fri, 28 Mar 2025 09:06:22 +0100
Subject: [PATCH] [bitnami/trivy] Release trivy-0.61.0-debian-12-r0 (#79199)

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
---
 bitnami/trivy/0/debian-12/Dockerfile             | 16 ++++++++--------
 .../opt/bitnami/.bitnami_components.json         |  2 +-
 bitnami/trivy/0/debian-12/tags-info.yaml         |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bitnami/trivy/0/debian-12/Dockerfile b/bitnami/trivy/0/debian-12/Dockerfile
index 77c5f1035fd7..478c861e8e74 100644
--- a/bitnami/trivy/0/debian-12/Dockerfile
+++ b/bitnami/trivy/0/debian-12/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
-FROM docker.io/bitnami/minideb:bookworm as builder
+FROM docker.io/bitnami/minideb:bookworm AS builder
 
 ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith"
 ARG TARGETARCH
@@ -13,9 +13,9 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl
-RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
+RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "trivy-0.60.0-2-linux-${OS_ARCH}-debian-12" \
+      "trivy-0.61.0-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -23,7 +23,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
         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' ; \
+      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \
       rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \
     done
 RUN mkdir -p /opt/bitnami/rootfs/.cache && chmod g+rwX /opt/bitnami/rootfs/.cache
@@ -40,12 +40,12 @@ ENV OS_ARCH="${TARGETARCH:-amd64}"
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="scratch" \
-      org.opencontainers.image.created="2025-03-20T11:28:38Z" \
+      org.opencontainers.image.created="2025-03-28T07:43:51Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
-      org.opencontainers.image.ref.name="0.60.0-debian-12-r3" \
+      org.opencontainers.image.ref.name="0.61.0-debian-12-r0" \
       org.opencontainers.image.title="trivy" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
-      org.opencontainers.image.version="0.60.0"
+      org.opencontainers.image.version="0.61.0"
 
 COPY rootfs /
 COPY --from=builder /opt/bitnami/rootfs /
@@ -54,7 +54,7 @@ COPY --from=builder /opt/bitnami/trivy/bin/trivy /opt/bitnami/trivy/bin/trivy
 COPY --from=builder /opt/bitnami/trivy/contrib /opt/bitnami/trivy/contrib
 COPY --from=builder /opt/bitnami/trivy/licenses /opt/bitnami/trivy/licenses
 
-ENV APP_VERSION="0.60.0" \
+ENV APP_VERSION="0.61.0" \
     BITNAMI_APP_NAME="trivy" \
     PATH="/opt/bitnami/trivy/bin:$PATH"
 
diff --git a/bitnami/trivy/0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/trivy/0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index afad5edddf7b..bfef3b01d99b 100644
--- a/bitnami/trivy/0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/trivy/0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "0.60.0-2"
+        "version": "0.61.0-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/trivy/0/debian-12/tags-info.yaml b/bitnami/trivy/0/debian-12/tags-info.yaml
index f0e57eaaad2c..ba5129745c09 100644
--- a/bitnami/trivy/0/debian-12/tags-info.yaml
+++ b/bitnami/trivy/0/debian-12/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "0"
 - 0-debian-12
-- 0.60.0
+- 0.61.0
 - latest