From aa17d79e776acbee3c4ef05ea772c99df9057063 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 3 Mar 2022 08:44:20 +0000
Subject: [PATCH] 7.8.1-debian-10-r85 release

---
 bitnami/jasperreports/7/debian-10/Dockerfile       |  2 +-
 .../rootfs/opt/bitnami/scripts/libmysqlclient.sh   | 14 ++++++++++----
 .../rootfs/opt/bitnami/scripts/libtomcat.sh        |  8 ++++++--
 .../rootfs/opt/bitnami/scripts/tomcat-env.sh       |  2 ++
 bitnami/jasperreports/README.md                    |  2 +-
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/bitnami/jasperreports/7/debian-10/Dockerfile b/bitnami/jasperreports/7/debian-10/Dockerfile
index 305779a2b434..0e0492e5cbd4 100644
--- a/bitnami/jasperreports/7/debian-10/Dockerfile
+++ b/bitnami/jasperreports/7/debian-10/Dockerfile
@@ -28,7 +28,7 @@ RUN /opt/bitnami/scripts/jasperreports/postunpack.sh
 RUN /opt/bitnami/scripts/java/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
 ENV BITNAMI_APP_NAME="jasperreports" \
-    BITNAMI_IMAGE_VERSION="7.8.1-debian-10-r84" \
+    BITNAMI_IMAGE_VERSION="7.8.1-debian-10-r85" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/mysql/bin:/opt/bitnami/git/bin:/opt/bitnami/common/bin:$PATH"
 
diff --git a/bitnami/jasperreports/7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/jasperreports/7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index 9609635e63a3..fee929c4ee1a 100644
--- a/bitnami/jasperreports/7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/jasperreports/7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -241,10 +241,16 @@ mysql_execute_print_output() {
     [[ "${#extra_opts[@]}" -gt 0 ]] && args+=("${extra_opts[@]}")
 
     # Obtain the command specified via stdin
-    local mysql_cmd
-    mysql_cmd="$(</dev/stdin)"
-    debug "Executing SQL command:\n$mysql_cmd"
-    "$DB_BIN_DIR/mysql" "${args[@]}" <<<"$mysql_cmd"
+    if [[ "${BITNAMI_DEBUG:-false}" = true ]]; then
+        local mysql_cmd
+        mysql_cmd="$(</dev/stdin)"
+        debug "Executing SQL command:\n$mysql_cmd"
+        "$DB_BIN_DIR/mysql" "${args[@]}" <<<"$mysql_cmd"
+    else
+        # Do not store the command(s) as a variable, to avoid issues when importing large files
+        # https://github.com/bitnami/bitnami-docker-mariadb/issues/251
+        "$DB_BIN_DIR/mysql" "${args[@]}"
+    fi
 }
 
 ########################
diff --git a/bitnami/jasperreports/7/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh b/bitnami/jasperreports/7/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh
index d42af0850771..2860e6b55119 100644
--- a/bitnami/jasperreports/7/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh
+++ b/bitnami/jasperreports/7/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh
@@ -180,8 +180,12 @@ EOF
         # Use tomcat:root ownership for compatibility when running as a non-root user
         am_i_root && configure_permissions_ownership "$TOMCAT_WEBAPPS_DIR" -d "775" -f "664" -u "$TOMCAT_DAEMON_USER" -g "root"
 
-        info "Deploying Tomcat from scratch"
-        cp -rp "$TOMCAT_BASE_DIR"/webapps_default/* "$TOMCAT_WEBAPPS_DIR"
+        if is_boolean_yes "$TOMCAT_INSTALL_DEFAULT_WEBAPPS"; then
+            info "Deploying Tomcat from scratch"
+            cp -rp "$TOMCAT_BASE_DIR"/webapps_default/* "$TOMCAT_WEBAPPS_DIR"
+        else
+            info "Skipping deployment of default webapps"
+        fi
 
         # Access control is configured in the application's context.xml with a Valve element
         # context.xml docs: https://tomcat.apache.org/tomcat-9.0-doc/config/context.html
diff --git a/bitnami/jasperreports/7/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh b/bitnami/jasperreports/7/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh
index 99a2916db4e4..904c13fa73f1 100644
--- a/bitnami/jasperreports/7/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh
+++ b/bitnami/jasperreports/7/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh
@@ -31,6 +31,7 @@ tomcat_env_vars=(
     TOMCAT_ENABLE_AJP
     TOMCAT_START_RETRIES
     TOMCAT_EXTRA_JAVA_OPTS
+    TOMCAT_INSTALL_DEFAULT_WEBAPPS
     JAVA_OPTS
 )
 for env_var in "${tomcat_env_vars[@]}"; do
@@ -77,6 +78,7 @@ export TOMCAT_ENABLE_AUTH="${TOMCAT_ENABLE_AUTH:-yes}"
 export TOMCAT_ENABLE_AJP="${TOMCAT_ENABLE_AJP:-no}"
 export TOMCAT_START_RETRIES="${TOMCAT_START_RETRIES:-12}"
 export TOMCAT_EXTRA_JAVA_OPTS="${TOMCAT_EXTRA_JAVA_OPTS:-}"
+export TOMCAT_INSTALL_DEFAULT_WEBAPPS="${TOMCAT_INSTALL_DEFAULT_WEBAPPS:-yes}"
 
 # Default JVM configuration
 export JAVA_HOME="${BITNAMI_ROOT_DIR}/java"
diff --git a/bitnami/jasperreports/README.md b/bitnami/jasperreports/README.md
index 822a6100ff08..9895bba7a762 100644
--- a/bitnami/jasperreports/README.md
+++ b/bitnami/jasperreports/README.md
@@ -43,7 +43,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-- [`7`, `7-debian-10`, `7.8.1`, `7.8.1-debian-10-r84`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-jasperreports/blob/7.8.1-debian-10-r84/7/debian-10/Dockerfile)
+- [`7`, `7-debian-10`, `7.8.1`, `7.8.1-debian-10-r85`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-jasperreports/blob/7.8.1-debian-10-r85/7/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/jasperreports GitHub repo](https://github.com/bitnami/bitnami-docker-jasperreports).