Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-12 14:57:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

2.4.48-debian-10-r2 release

Browse Source
This commit is contained in:
Bitnami Bot
2021-06-04 00:43:59 +00:00
parent 8ba5321c3b
commit 29ff40fac5
7 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/apache/2.4/debian-10/Dockerfile
View File

@@ -20,7 +20,7 @@ ENV APACHE_ENABLE_CUSTOM_PORTS="no" \
APACHE_HTTPS_PORT_NUMBER="" \
APACHE_HTTP_PORT_NUMBER="" \
BITNAMI_APP_NAME="apache" \
BITNAMI_IMAGE_VERSION="2.4.48-debian-10-r1" \
BITNAMI_IMAGE_VERSION="2.4.48-debian-10-r2" \
PATH="/opt/bitnami/common/bin:/opt/bitnami/apache/bin:$PATH"
EXPOSE 8080 8443

7
bitnami/apache/2.4/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
View File

@@ -177,6 +177,10 @@ web_server_reload() {
# --apache-before-vhost-configuration - Configuration to add before the <VirtualHost> directive (no default)
# --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no')
# --apache-extra-directory-configuration - Extra configuration for the document root directory
# --apache-proxy-address - Address where to proxy requests
# --apache-proxy-configuration - Extra configuration for the proxy
# --apache-proxy-http-configuration - Extra configuration for the proxy HTTP vhost
# --apache-proxy-https-configuration - Extra configuration for the proxy HTTPS vhost
# --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup
# NGINX-specific flags:
# --nginx-additional-configuration - Additional server block configuration (no default)
@@ -214,6 +218,9 @@ ensure_web_server_app_configuration_exists() {
| --apache-allow-override \
| --apache-extra-directory-configuration \
| --apache-proxy-address \
| --apache-proxy-configuration \
| --apache-proxy-http-configuration \
| --apache-proxy-https-configuration \
| --apache-move-htaccess \
)
apache_args+=("${1//apache-/}" "${2:?missing value}")

3
bitnami/apache/2.4/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl
View File

@@ -1,5 +1,8 @@
{{before_vhost_configuration}}
<VirtualHost {{http_listen_addresses}}>
ServerAlias *
{{proxy_configuration}}
{{proxy_http_configuration}}
ProxyPass / {{proxy_address}}
ProxyPassReverse / {{proxy_address}}
{{additional_configuration}}

4
bitnami/apache/2.4/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl
View File

@@ -1,7 +1,11 @@
{{before_vhost_configuration}}
<VirtualHost {{https_listen_addresses}}>
ServerAlias *
SSLEngine on
SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt"
SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key"
{{proxy_configuration}}
{{proxy_https_configuration}}
ProxyPass / {{proxy_address}}
ProxyPassReverse / {{proxy_address}}
{{additional_configuration}}

1
bitnami/apache/2.4/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-prefix.conf.tpl
View File

@@ -3,6 +3,7 @@
Options -Indexes +FollowSymLinks -MultiViews
AllowOverride {{allow_override}}
{{acl_configuration}}
{{proxy_configuration}}
ProxyPass / {{proxy_address}}
ProxyPassReverse / {{proxy_address}}
{{extra_directory_configuration}}

10
bitnami/apache/2.4/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
View File

@@ -330,6 +330,10 @@ EOF
# --allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no')
# --document-root - Path to document root directory
# --extra-directory-configuration - Extra configuration for the document root directory
# --proxy-address - Address where to proxy requests
# --proxy-configuration - Extra configuration for the proxy
# --proxy-http-configuration - Extra configuration for the proxy HTTP vhost
# --proxy-https-configuration - Extra configuration for the proxy HTTPS vhost
# Returns:
# true if the configuration was enabled, false otherwise
########################
@@ -352,6 +356,9 @@ ensure_apache_app_configuration_exists() {
export document_root="${BITNAMI_ROOT_DIR}/${app}"
export extra_directory_configuration=""
export proxy_address=""
export proxy_configuration=""
export proxy_http_configuration=""
export proxy_https_configuration=""
# Validate arguments
shift
while [[ "$#" -gt 0 ]]; do
@@ -373,6 +380,9 @@ ensure_apache_app_configuration_exists() {
| --document-root \
| --extra-directory-configuration \
| --proxy-address \
| --proxy-configuration \
| --proxy-http-configuration \
| --proxy-https-configuration \
)
var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
shift

2
bitnami/apache/README.md
View File

@@ -45,7 +45,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/).
* [`2.4`, `2.4-debian-10`, `2.4.48`, `2.4.48-debian-10-r1`, `latest` (2.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.48-debian-10-r1/2.4/debian-10/Dockerfile)
* [`2.4`, `2.4-debian-10`, `2.4.48`, `2.4.48-debian-10-r2`, `latest` (2.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.48-debian-10-r2/2.4/debian-10/Dockerfile)
Subscribe to project updates by watching the [bitnami/apache GitHub repo](https://github.com/bitnami/bitnami-docker-apache).