diff --git a/bitnami/odoo/13/debian-10/Dockerfile b/bitnami/odoo/13/debian-10/Dockerfile index c03a4f03d915..0ba578e21889 100644 --- a/bitnami/odoo/13/debian-10/Dockerfile +++ b/bitnami/odoo/13/debian-10/Dockerfile @@ -24,7 +24,7 @@ RUN curl -sLO https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12. COPY rootfs / RUN /opt/bitnami/scripts/odoo/postunpack.sh ENV BITNAMI_APP_NAME="odoo" \ - BITNAMI_IMAGE_VERSION="13.0.20211210-debian-10-r6" \ + BITNAMI_IMAGE_VERSION="13.0.20211210-debian-10-r7" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/common/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/bin:/opt/bitnami/odoo/bin:$PATH" \ POSTGRESQL_CLIENT_CREATE_DATABASE_NAME="" \ POSTGRESQL_CLIENT_CREATE_DATABASE_PASSWORD="" \ diff --git a/bitnami/odoo/13/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/odoo/13/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index 6bd564773acb..0a1a92a747f9 100644 --- a/bitnami/odoo/13/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/odoo/13/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/odoo/13/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/odoo/13/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 459f99c7d1cd..503650210583 100644 --- a/bitnami/odoo/13/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/odoo/13/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/odoo/README.md b/bitnami/odoo/README.md index 89c05918a58c..16f00db8f875 100644 --- a/bitnami/odoo/README.md +++ b/bitnami/odoo/README.md @@ -42,7 +42,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t - [`15`, `15-debian-10`, `15.0.20211210`, `15.0.20211210-debian-10-r6`, `latest` (15/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/15.0.20211210-debian-10-r6/15/debian-10/Dockerfile) - [`14`, `14-debian-10`, `14.0.20211210`, `14.0.20211210-debian-10-r6` (14/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/14.0.20211210-debian-10-r6/14/debian-10/Dockerfile) -- [`13`, `13-debian-10`, `13.0.20211210`, `13.0.20211210-debian-10-r6` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/13.0.20211210-debian-10-r6/13/debian-10/Dockerfile) +- [`13`, `13-debian-10`, `13.0.20211210`, `13.0.20211210-debian-10-r7` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-odoo/blob/13.0.20211210-debian-10-r7/13/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/odoo GitHub repo](https://github.com/bitnami/bitnami-docker-odoo).