diff --git a/bitnami/redis/6.2/debian-10/Dockerfile b/bitnami/redis/6.2/debian-10/Dockerfile index bbfb71a367d2..d971b05671ba 100644 --- a/bitnami/redis/6.2/debian-10/Dockerfile +++ b/bitnami/redis/6.2/debian-10/Dockerfile @@ -19,7 +19,7 @@ RUN ln -s /opt/bitnami/scripts/redis/run.sh /run.sh COPY rootfs / RUN /opt/bitnami/scripts/redis/postunpack.sh ENV BITNAMI_APP_NAME="redis" \ - BITNAMI_IMAGE_VERSION="6.2.6-debian-10-r68" \ + BITNAMI_IMAGE_VERSION="6.2.6-debian-10-r69" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/redis/bin:$PATH" EXPOSE 6379 diff --git a/bitnami/redis/6.2/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/redis/6.2/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index 6bd564773acb..0a1a92a747f9 100644 --- a/bitnami/redis/6.2/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/redis/6.2/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/redis/6.2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/redis/6.2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 459f99c7d1cd..503650210583 100644 --- a/bitnami/redis/6.2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/redis/6.2/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/redis/README.md b/bitnami/redis/README.md index 2b52819995a2..1e2604924923 100644 --- a/bitnami/redis/README.md +++ b/bitnami/redis/README.md @@ -49,7 +49,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/). -* [`6.2`, `6.2-debian-10`, `6.2.6`, `6.2.6-debian-10-r68`, `latest` (6.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis/blob/6.2.6-debian-10-r68/6.2/debian-10/Dockerfile) +* [`6.2`, `6.2-debian-10`, `6.2.6`, `6.2.6-debian-10-r69`, `latest` (6.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis/blob/6.2.6-debian-10-r69/6.2/debian-10/Dockerfile) * [`6.0`, `6.0-debian-10`, `6.0.16`, `6.0.16-debian-10-r71` (6.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis/blob/6.0.16-debian-10-r71/6.0/debian-10/Dockerfile) * [`5.0`, `5.0-debian-10`, `5.0.14`, `5.0.14-debian-10-r72` (5.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis/blob/5.0.14-debian-10-r72/5.0/debian-10/Dockerfile)