diff --git a/bitnami/zookeeper/3.6/debian-10/Dockerfile b/bitnami/zookeeper/3.6/debian-10/Dockerfile index f813059297d5..fff56d03f01d 100644 --- a/bitnami/zookeeper/3.6/debian-10/Dockerfile +++ b/bitnami/zookeeper/3.6/debian-10/Dockerfile @@ -21,7 +21,7 @@ RUN ln -s /opt/bitnami/scripts/zookeeper/run.sh /run.sh COPY rootfs / RUN /opt/bitnami/scripts/zookeeper/postunpack.sh ENV BITNAMI_APP_NAME="zookeeper" \ - BITNAMI_IMAGE_VERSION="3.6.3-debian-10-r189" + BITNAMI_IMAGE_VERSION="3.6.3-debian-10-r190" EXPOSE 2181 2888 3888 8080 diff --git a/bitnami/zookeeper/3.6/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/zookeeper/3.6/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index 6bd564773acb..0a1a92a747f9 100644 --- a/bitnami/zookeeper/3.6/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/zookeeper/3.6/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/zookeeper/3.6/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/zookeeper/3.6/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 459f99c7d1cd..503650210583 100644 --- a/bitnami/zookeeper/3.6/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/zookeeper/3.6/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/zookeeper/README.md b/bitnami/zookeeper/README.md index c5aff4c15d0e..81c76a983c09 100644 --- a/bitnami/zookeeper/README.md +++ b/bitnami/zookeeper/README.md @@ -54,7 +54,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`3.7`, `3.7-debian-10`, `3.7.0`, `3.7.0-debian-10-r234`, `latest` (3.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-zookeeper/blob/3.7.0-debian-10-r234/3.7/debian-10/Dockerfile) -* [`3.6`, `3.6-debian-10`, `3.6.3`, `3.6.3-debian-10-r189` (3.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-zookeeper/blob/3.6.3-debian-10-r189/3.6/debian-10/Dockerfile) +* [`3.6`, `3.6-debian-10`, `3.6.3`, `3.6.3-debian-10-r190` (3.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-zookeeper/blob/3.6.3-debian-10-r190/3.6/debian-10/Dockerfile) * [`3.5`, `3.5-debian-10`, `3.5.9`, `3.5.9-debian-10-r72` (3.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-zookeeper/blob/3.5.9-debian-10-r72/3.5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/zookeeper GitHub repo](https://github.com/bitnami/bitnami-docker-zookeeper).