public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

2.4.52-debian-10-r73 release

This commit is contained in:
Bitnami Bot 2022-03-10 07:42:01 +00:00
parent 5cb08d83fb
commit ff80c7e2ec
6 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ RUN /opt/bitnami/scripts/apache/postunpack.sh
ENV APACHE_HTTPS_PORT_NUMBER="" \
APACHE_HTTP_PORT_NUMBER="" \
BITNAMI_APP_NAME="apache" \
BITNAMI_IMAGE_VERSION="2.4.52-debian-10-r72" \
BITNAMI_IMAGE_VERSION="2.4.52-debian-10-r73" \
PATH="/opt/bitnami/common/bin:/opt/bitnami/apache/bin:$PATH"
EXPOSE 8080 8443

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

@ -23,6 +23,7 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}"
apache_env_vars=(
APACHE_HTTP_PORT_NUMBER
APACHE_HTTPS_PORT_NUMBER
APACHE_SERVER_TOKENS
APACHE_HTTP_PORT
APACHE_HTTPS_PORT
)
@ -72,5 +73,6 @@ export WEB_SERVER_HTTP_PORT_NUMBER="$APACHE_HTTP_PORT_NUMBER"
APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-"${APACHE_HTTPS_PORT:-}"}"
export APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-}"
export WEB_SERVER_HTTPS_PORT_NUMBER="$APACHE_HTTPS_PORT_NUMBER"
export APACHE_SERVER_TOKENS="${APACHE_SERVER_TOKENS:-Prod}"
# Custom environment variables may be defined below

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

@ -59,6 +59,7 @@ apache_setup_bitnami_config() {
Include "${APACHE_CONF_DIR}/extra/httpd-default.conf"
PidFile "${APACHE_PID_FILE}"
TraceEnable Off
ServerTokens ${APACHE_SERVER_TOKENS}
Include "${APACHE_CONF_DIR}/deflate.conf"
IncludeOptional "${APACHE_VHOSTS_DIR}/*.conf"
Include "${APACHE_CONF_DIR}/bitnami/bitnami.conf"

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

@ -56,5 +56,8 @@ fi
[[ -n "$APACHE_HTTP_PORT_NUMBER" ]] && info "Configuring the HTTP port" && apache_configure_http_port "$APACHE_HTTP_PORT_NUMBER"
[[ -n "$APACHE_HTTPS_PORT_NUMBER" ]] && info "Configuring the HTTPS port" && apache_configure_https_port "$APACHE_HTTPS_PORT_NUMBER"
# Configure ServerTokens with user values
[[ -n "$APACHE_SERVER_TOKENS" ]] && info "Configuring Apache ServerTokens directive" && apache_configure_server_tokens "$APACHE_SERVER_TOKENS"
# Fix logging issue when running as root
! am_i_root || chmod o+w "$(readlink /dev/stdout)" "$(readlink /dev/stderr)"

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

@ -112,6 +112,27 @@ apache_configure_https_port() {
fi
}
########################
# Configure Apache's ServerTokens directive
# Globals:
# APACHE_CONF_DIR
# Arguments:
# $1 - Value for ServerTokens directive
# Returns:
# None
#########################
apache_configure_server_tokens() {
local -r value=${1:?missing value}
local -r server_tokens_exp="s|^\s*ServerTokens\s+\w+\s*$|ServerTokens ${value}|"
local apache_configuration
if [[ -w "$APACHE_CONF_FILE" ]]; then
debug "Configuring ServerTokens ${value} on file ${APACHE_CONF_FILE}"
apache_configuration="$(sed -E -e "$server_tokens_exp" "$APACHE_CONF_FILE")"
echo "$apache_configuration" > "$APACHE_CONF_FILE"
fi
}
########################
# Enable a module in the Apache configuration file
# Globals:

2
bitnami/apache/README.md
View File

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