diff --git a/bitnami/phpbb/3/debian-10/Dockerfile b/bitnami/phpbb/3/debian-10/Dockerfile index 24326bb37f12..cb23a5030dc1 100644 --- a/bitnami/phpbb/3/debian-10/Dockerfile +++ b/bitnami/phpbb/3/debian-10/Dockerfile @@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="phpbb" \ - BITNAMI_IMAGE_VERSION="3.3.3-debian-10-r79" \ + BITNAMI_IMAGE_VERSION="3.3.3-debian-10-r80" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/phpbb/3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/phpbb/3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 25bff4a05105..da97ed81c921 100644 --- a/bitnami/phpbb/3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/phpbb/3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -212,6 +212,7 @@ ensure_web_server_app_configuration_exists() { | --apache-before-vhost-configuration \ | --apache-allow-override \ | --apache-extra-directory-configuration \ + | --apache-proxy-address \ | --apache-move-htaccess \ ) apache_args+=("${1//apache-/}" "${2:?missing value}") diff --git a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl new file mode 100644 index 000000000000..6c320e3f60e6 --- /dev/null +++ b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl @@ -0,0 +1,6 @@ + + ServerAlias * + ProxyPass / {{proxy_address}} + ProxyPassReverse / {{proxy_address}} + {{additional_configuration}} + diff --git a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl new file mode 100644 index 000000000000..2273f610dfad --- /dev/null +++ b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl @@ -0,0 +1,8 @@ + + ServerAlias * + SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" + SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" + ProxyPass / {{proxy_address}} + ProxyPassReverse / {{proxy_address}} + {{additional_configuration}} + diff --git a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-prefix.conf.tpl b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-prefix.conf.tpl new file mode 100644 index 000000000000..ffd0e72183c8 --- /dev/null +++ b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-prefix.conf.tpl @@ -0,0 +1,10 @@ +{{prefix_conf}} + + Options -Indexes +FollowSymLinks -MultiViews + AllowOverride {{allow_override}} + {{acl_configuration}} + ProxyPass / {{proxy_address}} + ProxyPassReverse / {{proxy_address}} + {{extra_directory_configuration}} + +{{additional_configuration}} diff --git a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh index 115d0f720e51..d6be5d2cd982 100644 --- a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh +++ b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh @@ -389,6 +389,7 @@ ensure_apache_app_configuration_exists() { export allow_override="All" export document_root="${BITNAMI_ROOT_DIR}/${app}" export extra_directory_configuration="" + export proxy_address="" # Validate arguments shift while [[ "$#" -gt 0 ]]; do @@ -409,6 +410,7 @@ ensure_apache_app_configuration_exists() { | --allow-override \ | --document-root \ | --extra-directory-configuration \ + | --proxy-address \ ) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift diff --git a/bitnami/phpbb/README.md b/bitnami/phpbb/README.md index 8f7b56ddd120..568b58804c24 100644 --- a/bitnami/phpbb/README.md +++ b/bitnami/phpbb/README.md @@ -42,7 +42,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/). -* [`3`, `3-debian-10`, `3.3.3`, `3.3.3-debian-10-r79`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpbb/blob/3.3.3-debian-10-r79/3/debian-10/Dockerfile) +* [`3`, `3-debian-10`, `3.3.3`, `3.3.3-debian-10-r80`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpbb/blob/3.3.3-debian-10-r80/3/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/phpbb GitHub repo](https://github.com/bitnami/bitnami-docker-phpbb).