From 27a9496ad1b5944f59c8f3f3ec437d28d94ce61d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 26 Oct 2022 16:14:28 +0200 Subject: [PATCH] [bitnami/jasperreports] Release 8.1.0-debian-11-r15 (#11486) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/jasperreports/8/debian-11/Dockerfile | 4 ++-- .../prebuildfs/opt/bitnami/.bitnami_components.json | 2 +- .../rootfs/opt/bitnami/scripts/jasperreports-env.sh | 6 ++++++ .../rootfs/opt/bitnami/scripts/libjasperreports.sh | 5 ++--- bitnami/jasperreports/README.md | 3 ++- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/bitnami/jasperreports/8/debian-11/Dockerfile b/bitnami/jasperreports/8/debian-11/Dockerfile index 0479d4f287bb..fd259be05b95 100644 --- a/bitnami/jasperreports/8/debian-11/Dockerfile +++ b/bitnami/jasperreports/8/debian-11/Dockerfile @@ -5,7 +5,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="8.1.0-debian-11-r14" \ + org.opencontainers.image.ref.name="8.1.0-debian-11-r15" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/jasperreports" \ org.opencontainers.image.title="jasperreports" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -22,7 +22,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates curl fontconfig git libaudit1 libbsd0 libcap-ng0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libmd0 libncurses6 libnettle8 libp11-kit0 libpam0g libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 procps xmlstarlet zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "java-1.8.352-0-linux-${OS_ARCH}-debian-11" \ + "java-1.8.352-1-linux-${OS_ARCH}-debian-11" \ "tomcat-9.0.68-0-linux-${OS_ARCH}-debian-11" \ "postgresql-client-11.17.0-2-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.6.10-1-linux-${OS_ARCH}-debian-11" \ diff --git a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c2dcef658fcc..a9c4b3b1252f 100644 --- a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -18,7 +18,7 @@ "digest": "e482df0561ee639bf2602c4e91f4ee1a48285ad5e2bdc994c7c37825664d7a82", "distro": "debian-11", "type": "NAMI", - "version": "1.8.352-0" + "version": "1.8.352-1" }, "mysql-client": { "arch": "amd64", diff --git a/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/jasperreports-env.sh b/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/jasperreports-env.sh index 61d7400964c7..d6e86f2b4992 100644 --- a/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/jasperreports-env.sh +++ b/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/jasperreports-env.sh @@ -34,6 +34,7 @@ jasperreports_env_vars=( JASPERREPORTS_SMTP_USER JASPERREPORTS_SMTP_PASSWORD JASPERREPORTS_SMTP_PROTOCOL + JASPERREPORTS_SMTP_EMAIL JASPERREPORTS_DATABASE_TYPE JASPERREPORTS_DATABASE_HOST JASPERREPORTS_DATABASE_PORT_NUMBER @@ -46,6 +47,8 @@ jasperreports_env_vars=( SMTP_USER SMTP_PASSWORD SMTP_PROTOCOL + SMTP_EMAIL + JASPERREPORTS_SMTP_USER MARIADB_HOST MARIADB_PORT_NUMBER MARIADB_DATABASE_NAME @@ -103,6 +106,9 @@ JASPERREPORTS_SMTP_PASSWORD="${JASPERREPORTS_SMTP_PASSWORD:-"${SMTP_PASSWORD:-}" export JASPERREPORTS_SMTP_PASSWORD="${JASPERREPORTS_SMTP_PASSWORD:-}" # only used during the first initialization JASPERREPORTS_SMTP_PROTOCOL="${JASPERREPORTS_SMTP_PROTOCOL:-"${SMTP_PROTOCOL:-}"}" export JASPERREPORTS_SMTP_PROTOCOL="${JASPERREPORTS_SMTP_PROTOCOL:-smtp}" # only used during the first initialization +JASPERREPORTS_SMTP_EMAIL="${JASPERREPORTS_SMTP_EMAIL:-"${SMTP_EMAIL:-}"}" +JASPERREPORTS_SMTP_EMAIL="${JASPERREPORTS_SMTP_EMAIL:-"${JASPERREPORTS_SMTP_USER:-}"}" +export JASPERREPORTS_SMTP_EMAIL="${JASPERREPORTS_SMTP_EMAIL:-fromuser@example.com}" # only used during the first initialization # Database configuration export JASPERREPORTS_DATABASE_TYPE="${JASPERREPORTS_DATABASE_TYPE:-mariadb}" # only used during the first initialization diff --git a/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/libjasperreports.sh b/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/libjasperreports.sh index 31a36b266268..240d9e11e2f2 100644 --- a/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/libjasperreports.sh +++ b/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/libjasperreports.sh @@ -98,8 +98,6 @@ jasperreports_validate() { done is_empty_value "$JASPERREPORTS_SMTP_PORT_NUMBER" && print_validation_error "The JASPERREPORTS_SMTP_PORT_NUMBER environment variable is empty or not set." ! is_empty_value "$JASPERREPORTS_SMTP_PORT_NUMBER" && check_valid_port "JASPERREPORTS_SMTP_PORT_NUMBER" - - # 'smtp' and 'smtps' are the only valid values (see issue [#112](https://github.com/bitnami/bitnami-docker-jasperreports/#112)). ! is_empty_value "$JASPERREPORTS_SMTP_PROTOCOL" && check_multi_value "JASPERREPORTS_SMTP_PROTOCOL" "smtp smtps" fi @@ -174,7 +172,7 @@ jasperreports_configure_smtp() { jasperreports_conf_set "quartz.mail.sender.protocol" "$JASPERREPORTS_SMTP_PROTOCOL" jasperreports_conf_set "quartz.mail.sender.username" "$JASPERREPORTS_SMTP_USER" jasperreports_conf_set "quartz.mail.sender.password" "$JASPERREPORTS_SMTP_PASSWORD" - jasperreports_conf_set "quartz.mail.sender.from" "$JASPERREPORTS_SMTP_USER" + jasperreports_conf_set "quartz.mail.sender.from" "$JASPERREPORTS_SMTP_EMAIL" # We only need to configure the URL when sending reports via email, so the user gets the proper URL for accessing the report # Source: https://community.jaspersoft.com/documentation/tibco-jasperreports-server-installation-guide/v720/configuring-report-scheduling jasperreports_conf_set "quartz.web.deployment.uri" "$JASPERREPORTS_HOST" @@ -368,6 +366,7 @@ jasperreports_initialize() { xmlstarlet ed -L --subnode '//*[name()="property" and @name="javaMailProperties"]/*[name()="props"]' --type elem -n "prop" -v "TLSv1.2" "${JASPERREPORTS_BASE_DIR}/WEB-INF/applicationContext-report-scheduling.xml" xmlstarlet ed -L -i '//*[name()="prop" and not(@key)]' --type "attr" -n "key" -v "mail.smtp.ssl.protocols" "${JASPERREPORTS_BASE_DIR}/WEB-INF/applicationContext-report-scheduling.xml" fi + else info "An already initialized JasperReports database was provided, configuration will be skipped" jasperreports_run_upgrade_scripts diff --git a/bitnami/jasperreports/README.md b/bitnami/jasperreports/README.md index 52c12263025e..815a96e4def0 100644 --- a/bitnami/jasperreports/README.md +++ b/bitnami/jasperreports/README.md @@ -283,7 +283,8 @@ To configure JasperReports to send email using SMTP you can set the following en - `JASPERREPORTS_SMTP_PORT_NUMBER`: SMTP port. - `JASPERREPORTS_SMTP_USER`: SMTP account user. - `JASPERREPORTS_SMTP_PASSWORD`: SMTP account password. -- `JASPERREPORTS_SMTP_PROTOCOL`: If specified, SMTP protocol to use. Allowed values: *smtp* and *smtps*. Default: **smtp**. +- `JASPERREPORTS_SMTP_PROTOCOL`: If specified, SMTP protocol to use. Allowed values: *smtp*, *smtps*. Default: **smtp**. +- `JASPERREPORTS_SMTP_EMAIL`: Custom email address for the 'From:' field. If not specified, the `JASPERREPORTS_SMTP_USER` value is used. ##### JasperReports base URL configuration