diff --git a/bitnami/apache/2.4/debian-10/Dockerfile b/bitnami/apache/2.4/debian-10/Dockerfile index f3a5e03faf2c..ff4b5e09a05a 100644 --- a/bitnami/apache/2.4/debian-10/Dockerfile +++ b/bitnami/apache/2.4/debian-10/Dockerfile @@ -21,7 +21,7 @@ ENV APACHE_ENABLE_CUSTOM_PORTS="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="apache" \ - BITNAMI_IMAGE_VERSION="2.4.43-debian-10-r78" \ + BITNAMI_IMAGE_VERSION="2.4.43-debian-10-r79" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/apache/bin:$PATH" EXPOSE 8080 8443 diff --git a/bitnami/apache/2.4/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh b/bitnami/apache/2.4/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh index c0238af61d02..8ad2e2ebedc1 100644 --- a/bitnami/apache/2.4/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh +++ b/bitnami/apache/2.4/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh @@ -51,15 +51,18 @@ export APACHE_DAEMON_USER="daemon" export WEB_SERVER_DAEMON_USER="$APACHE_DAEMON_USER" export APACHE_DAEMON_GROUP="daemon" export WEB_SERVER_DAEMON_GROUP="$APACHE_DAEMON_GROUP" +export WEB_SERVER_GROUP="$APACHE_DAEMON_GROUP" + +# Apache configuration export APACHE_DEFAULT_HTTP_PORT_NUMBER="8080" # only used at build time export WEB_SERVER_DEFAULT_HTTP_PORT_NUMBER="$APACHE_DEFAULT_HTTP_PORT_NUMBER" export APACHE_DEFAULT_HTTPS_PORT_NUMBER="8443" # only used at build time export WEB_SERVER_DEFAULT_HTTPS_PORT_NUMBER="$APACHE_DEFAULT_HTTPS_PORT_NUMBER" - -# Apache configuration export APACHE_HTTP_PORT_NUMBER="${APACHE_HTTP_PORT_NUMBER:-}" export WEB_SERVER_HTTP_PORT_NUMBER="$APACHE_HTTP_PORT_NUMBER" export APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-}" +export APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-"${APACHE_HTTPS_PORT:-}"}" +export APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-"${WEB_SERVER_HTTPS_PORT:-}"}" export WEB_SERVER_HTTPS_PORT_NUMBER="$APACHE_HTTPS_PORT_NUMBER" # Custom environment variables may be defined below diff --git a/bitnami/apache/README.md b/bitnami/apache/README.md index f02ba4c7d431..8cf7af1134c6 100644 --- a/bitnami/apache/README.md +++ b/bitnami/apache/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/). -* [`2.4-debian-10`, `2.4.43-debian-10-r78`, `2.4`, `2.4.43`, `latest` (2.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.43-debian-10-r78/2.4/debian-10/Dockerfile) +* [`2.4-debian-10`, `2.4.43-debian-10-r79`, `2.4`, `2.4.43`, `latest` (2.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.43-debian-10-r79/2.4/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/apache GitHub repo](https://github.com/bitnami/bitnami-docker-apache).