From a68db07bd31b3ce3b8dd908a0d63e83b70e430d1 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 23 Apr 2025 09:53:32 +0200 Subject: [PATCH] [bitnami/ejbca] Release ejbca-9.1.1-debian-12-r5 (#80504) Signed-off-by: Bitnami Bot --- bitnami/ejbca/9/debian-12/Dockerfile | 6 +++--- .../prebuildfs/opt/bitnami/.bitnami_components.json | 2 +- .../9/debian-12/rootfs/opt/bitnami/scripts/libejbca.sh | 7 +------ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/bitnami/ejbca/9/debian-12/Dockerfile b/bitnami/ejbca/9/debian-12/Dockerfile index 079c9e128c5e..883f3cde4129 100644 --- a/bitnami/ejbca/9/debian-12/Dockerfile +++ b/bitnami/ejbca/9/debian-12/Dockerfile @@ -9,10 +9,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-04-22T17:09:28Z" \ + org.opencontainers.image.created="2025-04-23T07:03:34Z" \ 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-r4" \ + org.opencontainers.image.ref.name="9.1.1-debian-12-r5" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/ejbca" \ org.opencontainers.image.title="ejbca" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -32,7 +32,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ "wildfly-32.0.1-14-linux-${OS_ARCH}-debian-12" \ "jre-21.0.7-9-0-linux-${OS_ARCH}-debian-12" \ "mysql-client-11.4.5-2-linux-${OS_ARCH}-debian-12" \ - "ejbca-9.1.1-1-linux-${OS_ARCH}-debian-12" \ + "ejbca-9.1.1-2-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ 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 ad8ed1de2b7b..6c473252f008 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 @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "9.1.1-1" + "version": "9.1.1-2" }, "jre": { "arch": "amd64", diff --git a/bitnami/ejbca/9/debian-12/rootfs/opt/bitnami/scripts/libejbca.sh b/bitnami/ejbca/9/debian-12/rootfs/opt/bitnami/scripts/libejbca.sh index d1d31d1b07b6..458f2efedf3e 100644 --- a/bitnami/ejbca/9/debian-12/rootfs/opt/bitnami/scripts/libejbca.sh +++ b/bitnami/ejbca/9/debian-12/rootfs/opt/bitnami/scripts/libejbca.sh @@ -140,8 +140,7 @@ wildfly_not_ready() { ejbca_configure_wildfly() { # The configuration of Wildfly in EJBCA https://doc.primekey.com/ejbca790/ejbca-installation/application-servers/wildfly-24 info "Creating data source" - local -r pluginJar="$(basename "$EJBCA_WILDFLY_DEPLOY_DIR"/mariadb*)" - ejbca_wildfly_command "data-source add --name=ejbcads --driver-name=\"${pluginJar}\" --connection-url=\"jdbc:${EJBCA_DATABASE_FLAVOR}://${EJBCA_DATABASE_HOST}:${EJBCA_DATABASE_PORT}/${EJBCA_DATABASE_NAME}\" --jndi-name=\"java:/EjbcaDS\" --use-ccm=true --driver-class=\"org.mariadb.jdbc.Driver\" --user-name=\"${EJBCA_DATABASE_USERNAME}\" --password=\"${EJBCA_DATABASE_PASSWORD}\" --validate-on-match=true --background-validation=false --prepared-statements-cache-size=50 --share-prepared-statements=true --min-pool-size=5 --max-pool-size=150 --pool-prefill=true --transaction-isolation=TRANSACTION_READ_COMMITTED --check-valid-connection-sql=\"select 1;\"" + ejbca_wildfly_command "data-source add --name=ejbcads --driver-name=mariadb --connection-url=\"jdbc:${EJBCA_DATABASE_FLAVOR}://${EJBCA_DATABASE_HOST}:${EJBCA_DATABASE_PORT}/${EJBCA_DATABASE_NAME}\" --jndi-name=\"java:/EjbcaDS\" --use-ccm=true --driver-class=\"org.mariadb.jdbc.Driver\" --user-name=\"${EJBCA_DATABASE_USERNAME}\" --password=\"${EJBCA_DATABASE_PASSWORD}\" --validate-on-match=true --background-validation=false --prepared-statements-cache-size=50 --share-prepared-statements=true --min-pool-size=5 --max-pool-size=150 --pool-prefill=true --transaction-isolation=TRANSACTION_READ_COMMITTED --check-valid-connection-sql=\"select 1;\"" ejbca_wildfly_command ":reload" wait_for_wildfly @@ -681,10 +680,6 @@ ejbca_initialize() { read -r EJBCA_TRUSTSTORE_PASSWORD <"$EJBCA_WILDFLY_TRUSTSTORE_PASSWORD_FILE" read -r EJBCA_WILDFLY_ADMIN_PASSWORD <"$EJBCA_WILDFLY_ADMIN_PASSWORD_FILE" - # Adapt the MariaDB driver version to the new one - local -r pluginJar="$(basename "$EJBCA_WILDFLY_DEPLOY_DIR"/mariadb*)" - replace_in_file "${EJBCA_WILDFLY_STANDALONE_XML_FILE}" "mariadb-java-client-.*.jar" "${pluginJar}" - ejbca_start_wildfly_bg wait_for_wildfly