From 44094f7699db1684cb72167065e7d036f9c59733 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 7 Jun 2024 18:19:38 +0200 Subject: [PATCH] [bitnami/ejbca] Release 8.2.0-1-debian-12-r16 (#67715) Signed-off-by: Bitnami Containers --- bitnami/ejbca/8/debian-12/Dockerfile | 4 ++-- .../ejbca/8/debian-12/rootfs/opt/bitnami/scripts/ejbca-env.sh | 2 ++ .../ejbca/8/debian-12/rootfs/opt/bitnami/scripts/libejbca.sh | 2 +- bitnami/ejbca/README.md | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bitnami/ejbca/8/debian-12/Dockerfile b/bitnami/ejbca/8/debian-12/Dockerfile index 7d5e81fe4d38..9ee986f24bbb 100644 --- a/bitnami/ejbca/8/debian-12/Dockerfile +++ b/bitnami/ejbca/8/debian-12/Dockerfile @@ -8,11 +8,11 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-06-06T13:25:26Z" \ + org.opencontainers.image.created="2024-06-07T15:31:24Z" \ 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.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.2.0-1-debian-12-r15" \ + org.opencontainers.image.ref.name="8.2.0-1-debian-12-r16" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/ejbca" \ org.opencontainers.image.title="ejbca" \ org.opencontainers.image.vendor="Broadcom, Inc." \ diff --git a/bitnami/ejbca/8/debian-12/rootfs/opt/bitnami/scripts/ejbca-env.sh b/bitnami/ejbca/8/debian-12/rootfs/opt/bitnami/scripts/ejbca-env.sh index b698b1b4d5d6..3150cee38ea9 100644 --- a/bitnami/ejbca/8/debian-12/rootfs/opt/bitnami/scripts/ejbca-env.sh +++ b/bitnami/ejbca/8/debian-12/rootfs/opt/bitnami/scripts/ejbca-env.sh @@ -33,6 +33,7 @@ ejbca_env_vars=( EJBCA_HTTPS_ADVERTISED_PORT_NUMBER EJBCA_ADMIN_USERNAME EJBCA_ADMIN_PASSWORD + EJBCA_DATABASE_FLAVOR EJBCA_DATABASE_HOST EJBCA_DATABASE_PORT EJBCA_DATABASE_NAME @@ -119,6 +120,7 @@ export EJBCA_HTTPS_PORT_NUMBER="${EJBCA_HTTPS_PORT_NUMBER:-8443}" export EJBCA_HTTPS_ADVERTISED_PORT_NUMBER="${EJBCA_HTTPS_ADVERTISED_PORT_NUMBER:-$EJBCA_HTTPS_PORT_NUMBER}" export EJBCA_ADMIN_USERNAME="${EJBCA_ADMIN_USERNAME:-superadmin}" export EJBCA_ADMIN_PASSWORD="${EJBCA_ADMIN_PASSWORD:-Bitnami1234}" +export EJBCA_DATABASE_FLAVOR="${EJBCA_DATABASE_FLAVOR:-mariadb}" export EJBCA_DATABASE_HOST="${EJBCA_DATABASE_HOST:-}" export EJBCA_DATABASE_PORT="${EJBCA_DATABASE_PORT:-3306}" export EJBCA_DATABASE_NAME="${EJBCA_DATABASE_NAME:-}" diff --git a/bitnami/ejbca/8/debian-12/rootfs/opt/bitnami/scripts/libejbca.sh b/bitnami/ejbca/8/debian-12/rootfs/opt/bitnami/scripts/libejbca.sh index 8b69cb85ba0b..d84677892b4d 100644 --- a/bitnami/ejbca/8/debian-12/rootfs/opt/bitnami/scripts/libejbca.sh +++ b/bitnami/ejbca/8/debian-12/rootfs/opt/bitnami/scripts/libejbca.sh @@ -141,7 +141,7 @@ 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:mysql://${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=\"${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 ":reload" wait_for_wildfly diff --git a/bitnami/ejbca/README.md b/bitnami/ejbca/README.md index 561754c1f07b..7c0632383754 100644 --- a/bitnami/ejbca/README.md +++ b/bitnami/ejbca/README.md @@ -158,6 +158,7 @@ You can also do this with a minor change to the [`docker-compose.yml`](https://g | `EJBCA_HTTPS_ADVERTISED_PORT_NUMBER` | Rendered port for administrator login URL | `$EJBCA_HTTPS_PORT_NUMBER` | | `EJBCA_ADMIN_USERNAME` | EJBCA administrator username | `superadmin` | | `EJBCA_ADMIN_PASSWORD` | EJBCA administrator password. | `Bitnami1234` | +| `EJBCA_DATABASE_FLAVOR` | EJBCA database flavor | `mariadb` | | `EJBCA_DATABASE_HOST` | Database hostname | `nil` | | `EJBCA_DATABASE_PORT` | Database port number. | `3306` | | `EJBCA_DATABASE_NAME` | EJBCA database name. | `nil` |