diff --git a/bitnami/java/17/debian-10/Dockerfile b/bitnami/java/17/debian-10/Dockerfile index 3cdb14482e9c..2c4e9165c6d3 100644 --- a/bitnami/java/17/debian-10/Dockerfile +++ b/bitnami/java/17/debian-10/Dockerfile @@ -25,7 +25,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/locales/add-extra-locales.sh RUN /opt/bitnami/scripts/java/postunpack.sh ENV BITNAMI_APP_NAME="java" \ - BITNAMI_IMAGE_VERSION="17.0.1-debian-10-r50" \ + BITNAMI_IMAGE_VERSION="17.0.1-debian-10-r51" \ JAVA_HOME="/opt/bitnami/java" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ diff --git a/bitnami/java/17/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/java/17/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index 6bd564773acb..0a1a92a747f9 100644 --- a/bitnami/java/17/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/java/17/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/java/17/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/java/17/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 459f99c7d1cd..503650210583 100644 --- a/bitnami/java/17/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/java/17/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/java/README.md b/bitnami/java/README.md index 2f1a01f3c395..2d37672d97db 100644 --- a/bitnami/java/README.md +++ b/bitnami/java/README.md @@ -39,7 +39,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`17-prod`, `17-prod-debian-10`, `17.0.1-prod`, `17.0.1-prod-debian-10-r50` (17-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/17.0.1-prod-debian-10-r50/17-prod/debian-10/Dockerfile) -* [`17`, `17-debian-10`, `17.0.1`, `17.0.1-debian-10-r50`, `latest` (17/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/17.0.1-debian-10-r50/17/debian-10/Dockerfile) +* [`17`, `17-debian-10`, `17.0.1`, `17.0.1-debian-10-r51`, `latest` (17/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/17.0.1-debian-10-r51/17/debian-10/Dockerfile) * [`11-prod`, `11-prod-debian-10`, `11.0.13-prod`, `11.0.13-prod-debian-10-r50` (11-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.13-prod-debian-10-r50/11-prod/debian-10/Dockerfile) * [`11`, `11-debian-10`, `11.0.13`, `11.0.13-debian-10-r50` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.13-debian-10-r50/11/debian-10/Dockerfile) * [`1.8-prod`, `1.8-prod-debian-10`, `1.8.312-prod`, `1.8.312-prod-debian-10-r54` (1.8-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.312-prod-debian-10-r54/1.8-prod/debian-10/Dockerfile)