diff --git a/bitnami/jasperreports/7/debian-10/Dockerfile b/bitnami/jasperreports/7/debian-10/Dockerfile index f96471431002..68e0c4352abb 100644 --- a/bitnami/jasperreports/7/debian-10/Dockerfile +++ b/bitnami/jasperreports/7/debian-10/Dockerfile @@ -27,7 +27,7 @@ RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh ENV ALLOW_EMPTY_PASSWORD="no" \ BITNAMI_APP_NAME="jasperreports" \ - BITNAMI_IMAGE_VERSION="7.8.1-debian-10-r30" \ + BITNAMI_IMAGE_VERSION="7.8.1-debian-10-r31" \ JAVA_HOME="/opt/bitnami/java" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ diff --git a/bitnami/jasperreports/7/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/jasperreports/7/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index 6bd564773acb..0a1a92a747f9 100644 --- a/bitnami/jasperreports/7/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/jasperreports/7/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh @@ -446,3 +446,19 @@ generate_sha_hash() { echo -n "$str" | "sha${algorithm}sum" | awk '{print $1}' } +######################## +# Converts a string to its hexadecimal representation +# Arguments: +# $1 - string +# Returns: +# hexadecimal representation of the string +######################### +convert_to_hex() { + local -r str=${1:?missing input string} + local -i iterator + local char + for ((iterator=0; iterator<${#str}; iterator++)); do + char=${str:iterator:1} + printf '%x' "'${char}" + done +} diff --git a/bitnami/jasperreports/7/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/jasperreports/7/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 459f99c7d1cd..503650210583 100644 --- a/bitnami/jasperreports/7/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/jasperreports/7/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -177,6 +177,8 @@ web_server_reload() { # --document-root - Path to document root directory # Apache-specific flags: # --apache-additional-configuration - Additional vhost configuration (no default) +# --apache-additional-http-configuration - Additional HTTP vhost configuration (no default) +# --apache-additional-https-configuration - Additional HTTPS vhost configuration (no default) # --apache-before-vhost-configuration - Configuration to add before the directive (no default) # --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined) # --apache-extra-directory-configuration - Extra configuration for the document root directory @@ -224,6 +226,8 @@ ensure_web_server_app_configuration_exists() { # Specific Apache flags --apache-additional-configuration \ + | --apache-additional-http-configuration \ + | --apache-additional-https-configuration \ | --apache-before-vhost-configuration \ | --apache-allow-override \ | --apache-extra-directory-configuration \ 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 bdd7cae7eff7..d16e036df0a4 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 @@ -478,7 +478,7 @@ mysql_upgrade() { else mysql_start_bg is_boolean_yes "${ROOT_AUTH_ENABLED:-false}" && args+=("-p$(get_master_env_var_value ROOT_PASSWORD)") - debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" + debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" --force fi } diff --git a/bitnami/jasperreports/README.md b/bitnami/jasperreports/README.md index adf9a9090129..00139edfc9ec 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-r30`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-jasperreports/blob/7.8.1-debian-10-r30/7/debian-10/Dockerfile) +- [`7`, `7-debian-10`, `7.8.1`, `7.8.1-debian-10-r31`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-jasperreports/blob/7.8.1-debian-10-r31/7/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/jasperreports GitHub repo](https://github.com/bitnami/bitnami-docker-jasperreports).