diff --git a/bitnami/wordpress/5/debian-10/Dockerfile b/bitnami/wordpress/5/debian-10/Dockerfile index 41075e3ab757..b6b3876ac5b8 100644 --- a/bitnami/wordpress/5/debian-10/Dockerfile +++ b/bitnami/wordpress/5/debian-10/Dockerfile @@ -21,8 +21,8 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/mysql-client/postunpack.sh -RUN /opt/bitnami/scripts/php/postunpack.sh RUN /opt/bitnami/scripts/apache/postunpack.sh +RUN /opt/bitnami/scripts/php/postunpack.sh RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh RUN /opt/bitnami/scripts/wordpress/postunpack.sh ENV ALLOW_EMPTY_PASSWORD="no" \ @@ -30,7 +30,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="wordpress" \ - BITNAMI_IMAGE_VERSION="5.8.2-debian-10-r34" \ + BITNAMI_IMAGE_VERSION="5.8.2-debian-10-r35" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index 6bd564773acb..0a1a92a747f9 100644 --- a/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/wordpress/5/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/wordpress/5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 459f99c7d1cd..503650210583 100644 --- a/bitnami/wordpress/5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/wordpress/5/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/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-http-vhost.conf.tpl b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-http-vhost.conf.tpl index eacc2462307f..b434680af734 100644 --- a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-http-vhost.conf.tpl +++ b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-http-vhost.conf.tpl @@ -2,5 +2,6 @@ {{before_vhost_configuration}} {{server_name_configuration}} + {{additional_http_configuration}} {{additional_configuration}} diff --git a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl index 0cbe5e47ca37..589538513c9c 100644 --- a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl +++ b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl @@ -5,5 +5,6 @@ SSLEngine on SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" + {{additional_https_configuration}} {{additional_configuration}} diff --git a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-http-vhost.conf.tpl b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-http-vhost.conf.tpl index 56780c5d258b..96be8f822771 100644 --- a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-http-vhost.conf.tpl +++ b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-http-vhost.conf.tpl @@ -9,6 +9,7 @@ {{acl_configuration}} {{extra_directory_configuration}} + {{additional_http_configuration}} {{additional_configuration}} {{htaccess_include}} diff --git a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl index 2fcc78c01951..1ad938929726 100644 --- a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl +++ b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl @@ -12,6 +12,7 @@ {{acl_configuration}} {{extra_directory_configuration}} + {{additional_https_configuration}} {{additional_configuration}} {{htaccess_include}} diff --git a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl index 854b321ad6ec..9440b89d28bf 100644 --- a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl +++ b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl @@ -6,5 +6,6 @@ {{proxy_http_configuration}} ProxyPass / {{proxy_address}} ProxyPassReverse / {{proxy_address}} + {{additional_http_configuration}} {{additional_configuration}} diff --git a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl index d8a5352263a6..577cd461eb9d 100644 --- a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl +++ b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl @@ -9,5 +9,6 @@ {{proxy_https_configuration}} ProxyPass / {{proxy_address}} ProxyPassReverse / {{proxy_address}} + {{additional_https_configuration}} {{additional_configuration}} diff --git a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-http-vhost.conf.tpl b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-http-vhost.conf.tpl index 44be06d12aad..f518c7d42aab 100644 --- a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-http-vhost.conf.tpl +++ b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-http-vhost.conf.tpl @@ -11,5 +11,6 @@ PassengerPreStart http://localhost:{{http_port}}/ PassengerEnabled on {{extra_directory_configuration}} + {{additional_http_configuration}} {{additional_configuration}} diff --git a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl index fdc65c37cee9..5aae54c37d3b 100644 --- a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl +++ b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl @@ -14,5 +14,6 @@ PassengerPreStart https://localhost:{{https_port}}/ PassengerEnabled on {{extra_directory_configuration}} + {{additional_https_configuration}} {{additional_configuration}} diff --git a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh index bf287455b46c..10a4cf70c378 100644 --- a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh +++ b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh @@ -329,6 +329,8 @@ EOF # --https-port - HTTPS port number # --move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup (only allowed when type is not defined) # --additional-configuration - Additional vhost configuration (no default) +# --additional-http-configuration - Additional HTTP vhost configuration (no default) +# --additional-https-configuration - Additional HTTPS vhost configuration (no default) # --before-vhost-configuration - Configuration to add before the directive (no default) # --allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined) # --document-root - Path to document root directory @@ -354,6 +356,8 @@ ensure_apache_app_configuration_exists() { local move_htaccess="yes" # Template variables defaults export additional_configuration="" + export additional_http_configuration="" + export additional_https_configuration="" export before_vhost_configuration="" export allow_override="All" export document_root="${BITNAMI_ROOT_DIR}/${app}" @@ -391,6 +395,8 @@ ensure_apache_app_configuration_exists() { | --https-port \ | --move-htaccess \ | --additional-configuration \ + | --additional-http-configuration \ + | --additional-https-configuration \ | --before-vhost-configuration \ | --allow-override \ | --document-root \ @@ -461,6 +467,8 @@ EOF # Indent configurations server_name_configuration="$(indent $'\n'"$server_name_configuration" 2)" additional_configuration="$(indent $'\n'"$additional_configuration" 2)" + additional_http_configuration="$(indent $'\n'"$additional_http_configuration" 2)" + additional_https_configuration="$(indent $'\n'"$additional_https_configuration" 2)" htaccess_include="$(indent $'\n'"$htaccess_include" 2)" acl_configuration=""$(indent $'\n'"$acl_configuration" 4) extra_directory_configuration="$(indent $'\n'"$extra_directory_configuration" 4)" diff --git a/bitnami/wordpress/README.md b/bitnami/wordpress/README.md index 2fb8ae90027a..15101b83d3b1 100644 --- a/bitnami/wordpress/README.md +++ b/bitnami/wordpress/README.md @@ -43,7 +43,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/). -- [`5`, `5-debian-10`, `5.8.2`, `5.8.2-debian-10-r34`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.8.2-debian-10-r34/5/debian-10/Dockerfile) +- [`5`, `5-debian-10`, `5.8.2`, `5.8.2-debian-10-r35`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.8.2-debian-10-r35/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/wordpress GitHub repo](https://github.com/bitnami/bitnami-docker-wordpress).