From 0c306b6eb6d3c0e401b99cfa27fbee9d28910ea1 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 19 Jun 2020 22:25:06 +0000 Subject: [PATCH] 2.4.43-debian-10-r81 release --- bitnami/apache/2.4/debian-10/Dockerfile | 2 +- .../2.4/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh | 3 ++- bitnami/apache/README.md | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bitnami/apache/2.4/debian-10/Dockerfile b/bitnami/apache/2.4/debian-10/Dockerfile index 56afa89a563f..c8fa83359dd8 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-r80" \ + BITNAMI_IMAGE_VERSION="2.4.43-debian-10-r81" \ 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 8ad2e2ebedc1..e5a4aa18b097 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 @@ -60,9 +60,10 @@ export APACHE_DEFAULT_HTTPS_PORT_NUMBER="8443" # only used at build time export WEB_SERVER_DEFAULT_HTTPS_PORT_NUMBER="$APACHE_DEFAULT_HTTPS_PORT_NUMBER" 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 APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-}" 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 55250a86d352..d6db1ccc4d6d 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-r80`, `2.4`, `2.4.43`, `latest` (2.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.43-debian-10-r80/2.4/debian-10/Dockerfile) +* [`2.4-debian-10`, `2.4.43-debian-10-r81`, `2.4`, `2.4.43`, `latest` (2.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.43-debian-10-r81/2.4/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/apache GitHub repo](https://github.com/bitnami/bitnami-docker-apache).