From 00f62cb3a98421857eab505e29be718e03b48ea0 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami.bot@broadcom.com>
Date: Thu, 26 Jun 2025 10:18:13 +0200
Subject: [PATCH] [bitnami/ejbca] Release 9.1.1-debian-12-r8 (#82605)

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

diff --git a/bitnami/ejbca/9/debian-12/Dockerfile b/bitnami/ejbca/9/debian-12/Dockerfile
index 2b84c3684599..1337ab98d275 100644
--- a/bitnami/ejbca/9/debian-12/Dockerfile
+++ b/bitnami/ejbca/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-30T14:20:59Z" \
+      org.opencontainers.image.created="2025-06-26T06:21:39Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/ejbca/README.md" \
-      org.opencontainers.image.ref.name="9.1.1-debian-12-r7" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/ejbca" \
       org.opencontainers.image.title="ejbca" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -27,11 +26,13 @@ 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 libaio1 libaudit1 libcap-ng0 libgcc-s1 libicu72 liblzma5 libncurses6 libpam0g libssl3 libstdc++6 libtinfo6 libxml2 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=( \
-      "wildfly-32.0.1-15-linux-${OS_ARCH}-debian-12" \
+      "wildfly-32.0.1-16-linux-${OS_ARCH}-debian-12" \
       "jre-21.0.7-9-0-linux-${OS_ARCH}-debian-12" \
-      "mysql-client-11.4.7-0-linux-${OS_ARCH}-debian-12" \
+      "mysql-client-11.8.2-0-linux-${OS_ARCH}-debian-12" \
       "ejbca-9.1.1-2-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
@@ -47,6 +48,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/ejbca/postunpack.sh
diff --git a/bitnami/ejbca/9/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ejbca/9/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 649d70a45cd7..a706eab6d8d7 100644
--- a/bitnami/ejbca/9/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/ejbca/9/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,12 +15,12 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "11.4.7-0"
+        "version": "11.8.2-0"
     },
     "wildfly": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "32.0.1-15"
+        "version": "32.0.1-16"
     }
 }
\ No newline at end of file
diff --git a/bitnami/ejbca/9/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/ejbca/9/debian-12/prebuildfs/usr/sbin/uninstall_packages
new file mode 100755
index 000000000000..615c430e4e68
--- /dev/null
+++ b/bitnami/ejbca/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/ejbca/9/debian-12/tags-info.yaml b/bitnami/ejbca/9/debian-12/tags-info.yaml
index 47db25858ef5..3f5972de9f50 100644
--- a/bitnami/ejbca/9/debian-12/tags-info.yaml
+++ b/bitnami/ejbca/9/debian-12/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
-- "9"
-- 9-debian-12
-- 9.1.1
-- latest
+  - "9"
+  - 9-debian-12
+  - 9.1.1
+  - latest
diff --git a/bitnami/ejbca/README.md b/bitnami/ejbca/README.md
index cb43ac0f3b05..1ae58685411a 100644
--- a/bitnami/ejbca/README.md
+++ b/bitnami/ejbca/README.md
@@ -139,7 +139,7 @@ You can also do this with a minor change to the [`docker-compose.yml`](https://g
    ejbca:
      ...
      volumes:
--      - 'wildfly_data:/bitnami/wildfly'
+-      - wildfly_data:/bitnami/wildfly
 +      - /path/to/ejbca-persistence:/bitnami/wildfly
    ...
 -volumes: