diff --git a/bitnami/wavefront-proxy/10/debian-10/Dockerfile b/bitnami/wavefront-proxy/10/debian-10/Dockerfile index b1748469d175..df5830094a51 100644 --- a/bitnami/wavefront-proxy/10/debian-10/Dockerfile +++ b/bitnami/wavefront-proxy/10/debian-10/Dockerfile @@ -12,7 +12,7 @@ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libc6 procps tar zlib1g RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "11.0.13-0" --checksum 9552e53ccd3b0ec85a82c31c26a1462260e28b7c58770a5c53560afb02ec66d9 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wavefront-proxy" "10.11.0-0" --checksum 14a585c4e3184a690fddf4ad0321e0c00ed272d3499dbdd83273f4104a385f98 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wavefront-proxy" "10.12.0-0" --checksum 8a27fa485b8e3c5a31464b5802042335aefca5ff2a7deae82aea51090f7bdc04 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e RUN chmod g+rwX /opt/bitnami @@ -20,7 +20,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/wavefront-proxy/postunpack.sh ENV BITNAMI_APP_NAME="wavefront-proxy" \ - BITNAMI_IMAGE_VERSION="10.11.0-debian-10-r1" \ + BITNAMI_IMAGE_VERSION="10.12.0-debian-10-r0" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 748d785244ef..cf250bab2821 100644 --- a/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,9 +15,9 @@ }, "wavefront-proxy": { "arch": "amd64", - "digest": "14a585c4e3184a690fddf4ad0321e0c00ed272d3499dbdd83273f4104a385f98", + "digest": "8a27fa485b8e3c5a31464b5802042335aefca5ff2a7deae82aea51090f7bdc04", "distro": "debian-10", "type": "NAMI", - "version": "10.11.0-0" + "version": "10.12.0-0" } } \ No newline at end of file diff --git a/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index 6bd564773acb..0a1a92a747f9 100644 --- a/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/wavefront-proxy/10/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/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 459f99c7d1cd..503650210583 100644 --- a/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/wavefront-proxy/10/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/wavefront-proxy/README.md b/bitnami/wavefront-proxy/README.md index 380b1c5323af..73c3f19f7ccd 100644 --- a/bitnami/wavefront-proxy/README.md +++ b/bitnami/wavefront-proxy/README.md @@ -31,7 +31,7 @@ $ docker run --name wavefront-proxy bitnami/wavefront-proxy:latest 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/). -* [`10`, `10-debian-10`, `10.11.0`, `10.11.0-debian-10-r1`, `latest` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wavefront-proxy/blob/10.11.0-debian-10-r1/10/debian-10/Dockerfile) +* [`10`, `10-debian-10`, `10.12.0`, `10.12.0-debian-10-r0`, `latest` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wavefront-proxy/blob/10.12.0-debian-10-r0/10/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/wavefront-proxy GitHub repo](https://github.com/bitnami/bitnami-docker-wavefront-proxy).