From 76b139fdafee79518327d9d34ddf6e7ca8ad0fde Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami.bot@broadcom.com>
Date: Sun, 29 Jun 2025 19:42:55 +0200
Subject: [PATCH] [bitnami/solr] Release 9.8.1-debian-12-r10 (#82790)

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

diff --git a/bitnami/solr/9/debian-12/Dockerfile b/bitnami/solr/9/debian-12/Dockerfile
index 1d9c07100ee3..7cf74545e22c 100644
--- a/bitnami/solr/9/debian-12/Dockerfile
+++ b/bitnami/solr/9/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-05-30T16:53:46Z" \
+      org.opencontainers.image.created="2025-06-29T17:20:08Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/solr/README.md" \
-      org.opencontainers.image.ref.name="9.8.1-debian-12-r9" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/solr" \
       org.opencontainers.image.title="solr" \
       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 lsof netcat-openbsd 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" \
       "solr-9.8.1-0-linux-${OS_ARCH}-debian-12" \
diff --git a/bitnami/solr/9/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/solr/9/debian-12/prebuildfs/usr/sbin/uninstall_packages
new file mode 100755
index 000000000000..615c430e4e68
--- /dev/null
+++ b/bitnami/solr/9/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/solr/9/debian-12/tags-info.yaml b/bitnami/solr/9/debian-12/tags-info.yaml
index 581b9a7275ca..57435834a026 100644
--- a/bitnami/solr/9/debian-12/tags-info.yaml
+++ b/bitnami/solr/9/debian-12/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
-- "9"
-- 9-debian-12
-- 9.8.1
-- latest
+  - "9"
+  - 9-debian-12
+  - 9.8.1
+  - latest
diff --git a/bitnami/solr/README.md b/bitnami/solr/README.md
index efc94001246f..82c754cd4d67 100644
--- a/bitnami/solr/README.md
+++ b/bitnami/solr/README.md
@@ -129,13 +129,13 @@ services:
     networks:
       - solr-network
     ports:
-      - '8983:8983'
+      - 8983:8983
   solr-node2:
     image: bitnami/solr:latest
     networks:
       - solr-network
     ports:
-      - '8984:8984'
+      - 8984:8984
 ```
 
 Then, launch the containers using:
@@ -231,7 +231,7 @@ solr:
   environment:
     - SOLR_CORE_CONF_DIR=/container/path/to/your/confDir
   volumes:
-    - '/local/path/to/your/confDir:/container/path/to/your/confDir'
+    - /local/path/to/your/confDir:/container/path/to/your/confDir
   ...
 ```