From 2047bacaaea2d0e5a9dfa9ab893919eac0d4ca8f Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami.bot@broadcom.com>
Date: Thu, 26 Jun 2025 10:21:57 +0200
Subject: [PATCH] [bitnami/sonarqube] Release 25.6.0-debian-12-r2 (#82625)

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

diff --git a/bitnami/sonarqube/25/debian-12/Dockerfile b/bitnami/sonarqube/25/debian-12/Dockerfile
index 764fed954e5c..45f747c5143d 100644
--- a/bitnami/sonarqube/25/debian-12/Dockerfile
+++ b/bitnami/sonarqube/25/debian-12/Dockerfile
@@ -9,10 +9,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-06-02T16:33:19Z" \
+      org.opencontainers.image.created="2025-06-26T06:29:53Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/sonarqube/README.md" \
-      org.opencontainers.image.ref.name="25.6.0-debian-12-r1" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/sonarqube" \
       org.opencontainers.image.title="sonarqube" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -27,7 +26,9 @@ COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl libbsd0 libedit2 libffi8 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu72 libidn2-0 libldap-2.5-0 liblz4-1 liblzma5 libmd0 libnettle8 libp11-kit0 libsasl2-2 libssl3 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 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=( \
       "postgresql-client-17.5.0-1-linux-${OS_ARCH}-debian-12" \
       "jre-17.0.15-10-0-linux-${OS_ARCH}-debian-12" \
diff --git a/bitnami/sonarqube/25/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/sonarqube/25/debian-12/prebuildfs/usr/sbin/uninstall_packages
new file mode 100755
index 000000000000..615c430e4e68
--- /dev/null
+++ b/bitnami/sonarqube/25/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/sonarqube/25/debian-12/tags-info.yaml b/bitnami/sonarqube/25/debian-12/tags-info.yaml
index c01592a019b5..2199229e54ca 100644
--- a/bitnami/sonarqube/25/debian-12/tags-info.yaml
+++ b/bitnami/sonarqube/25/debian-12/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
-- "25"
-- 25-debian-12
-- 25.6.0
-- latest
+  - "25"
+  - 25-debian-12
+  - 25.6.0
+  - latest
diff --git a/bitnami/sonarqube/README.md b/bitnami/sonarqube/README.md
index 06bad4ffcf04..ab38ca89bdca 100644
--- a/bitnami/sonarqube/README.md
+++ b/bitnami/sonarqube/README.md
@@ -138,13 +138,13 @@ This requires a minor change to the [`docker-compose.yml`](https://github.com/bi
    postgresql:
      ...
      volumes:
--      - 'postgresql_data:/bitnami/postgresql'
+-      - postgresql_data:/bitnami/postgresql
 +      - /path/to/postgresql-persistence:/bitnami/postgresql
    ...
    sonarqube:
      ...
      volumes:
--      - 'sonarqube_data:/bitnami/sonarqube'
+-      - sonarqube_data:/bitnami/sonarqube
 +      - /path/to/sonarqube-persistence:/bitnami/sonarqube
    ...
 -volumes: