diff --git a/bitnami/postgresql/10/debian-10/Dockerfile b/bitnami/postgresql/10/debian-10/Dockerfile index 922f25d08d25..6ecb1984e43e 100644 --- a/bitnami/postgresql/10/debian-10/Dockerfile +++ b/bitnami/postgresql/10/debian-10/Dockerfile @@ -22,7 +22,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/postgresql/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh ENV BITNAMI_APP_NAME="postgresql" \ - BITNAMI_IMAGE_VERSION="10.19.0-debian-10-r33" \ + BITNAMI_IMAGE_VERSION="10.19.0-debian-10-r34" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ diff --git a/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index 6bd564773acb..0a1a92a747f9 100644 --- a/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/postgresql/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/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 459f99c7d1cd..503650210583 100644 --- a/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/postgresql/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/postgresql/README.md b/bitnami/postgresql/README.md index 72c0050a71e1..b1a64f09c5c2 100644 --- a/bitnami/postgresql/README.md +++ b/bitnami/postgresql/README.md @@ -54,7 +54,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`13`, `13-debian-10`, `13.5.0`, `13.5.0-debian-10-r33` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.5.0-debian-10-r33/13/debian-10/Dockerfile) * [`12`, `12-debian-10`, `12.9.0`, `12.9.0-debian-10-r33` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.9.0-debian-10-r33/12/debian-10/Dockerfile) * [`11`, `11-debian-10`, `11.14.0`, `11.14.0-debian-10-r17`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.14.0-debian-10-r17/11/debian-10/Dockerfile) -* [`10`, `10-debian-10`, `10.19.0`, `10.19.0-debian-10-r33` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.19.0-debian-10-r33/10/debian-10/Dockerfile) +* [`10`, `10-debian-10`, `10.19.0`, `10.19.0-debian-10-r34` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.19.0-debian-10-r34/10/debian-10/Dockerfile) * [`9.6`, `9.6-debian-10`, `9.6.24`, `9.6.24-debian-10-r33` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.24-debian-10-r33/9.6/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).