From da733703afcd31b1f3d1ad42df8161b7194f5a70 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 8 Apr 2021 10:30:03 +0000
Subject: [PATCH] 2.4.46-debian-10-r220 release

---
 bitnami/apache/2.4/debian-10/Dockerfile                       | 2 +-
 bitnami/apache/2.4/debian-10/docker-compose.yml               | 2 +-
 .../2.4/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh    | 2 ++
 .../debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh    | 4 ++--
 bitnami/apache/README.md                                      | 2 +-
 bitnami/apache/docker-compose.yml                             | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/bitnami/apache/2.4/debian-10/Dockerfile b/bitnami/apache/2.4/debian-10/Dockerfile
index 879cc4dda1c9..f1036ec60014 100644
--- a/bitnami/apache/2.4/debian-10/Dockerfile
+++ b/bitnami/apache/2.4/debian-10/Dockerfile
@@ -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.46-debian-10-r219" \
+    BITNAMI_IMAGE_VERSION="2.4.46-debian-10-r220" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/apache/bin:$PATH"
 
 EXPOSE 8080 8443
diff --git a/bitnami/apache/2.4/debian-10/docker-compose.yml b/bitnami/apache/2.4/debian-10/docker-compose.yml
index 32c54c589dfb..7ce99e568afe 100644
--- a/bitnami/apache/2.4/debian-10/docker-compose.yml
+++ b/bitnami/apache/2.4/debian-10/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   apache:
-    image: docker.io/bitnami/apache:2.4-debian-10
+    image: docker.io/bitnami/apache:2.4
     ports:
       - 80:8080
       - 443:8443
diff --git a/bitnami/apache/2.4/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/apache/2.4/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh
index 60ec4cbfc32a..c7c0f6d4422a 100644
--- a/bitnami/apache/2.4/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh
+++ b/bitnami/apache/2.4/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh
@@ -106,5 +106,7 @@ indent() {
     for ((i = 0; i < num; i++)); do
         indent_unit="${indent_unit}${char}"
     done
+    # shellcheck disable=SC2001
+    # Complex regex, see https://github.com/koalaman/shellcheck/wiki/SC2001#exceptions
     echo "$string" | sed "s/^/${indent_unit}/"
 }
diff --git a/bitnami/apache/2.4/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/apache/2.4/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh
index 66d4f457bdd2..f3bc7568bfa5 100644
--- a/bitnami/apache/2.4/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh
+++ b/bitnami/apache/2.4/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh
@@ -9,7 +9,7 @@
 
 # Functions
 ########################
-# Gets semantic version 
+# Gets semantic version
 # Arguments:
 #   $1 - version: string to extract major.minor.patch
 #   $2 - section: 1 to extract major, 2 to extract minor, 3 to extract patch
@@ -38,7 +38,7 @@ get_sematic_version () {
         done
 
         local number_regex='^[0-9]+$'
-        if [[ "$section" =~ $number_regex ]] && (( $section > 0 )) && (( $section <= 3 )); then
+        if [[ "$section" =~ $number_regex ]] && (( section > 0 )) && (( section <= 3 )); then
              echo "${version_sections[$section]}"
              return
         else
diff --git a/bitnami/apache/README.md b/bitnami/apache/README.md
index bb02ce796949..bd6fe99ce3dd 100644
--- a/bitnami/apache/README.md
+++ b/bitnami/apache/README.md
@@ -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.46`, `2.4.46-debian-10-r219`, `latest` (2.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.46-debian-10-r219/2.4/debian-10/Dockerfile)
+* [`2.4`, `2.4-debian-10`, `2.4.46`, `2.4.46-debian-10-r220`, `latest` (2.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.46-debian-10-r220/2.4/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/apache GitHub repo](https://github.com/bitnami/bitnami-docker-apache).
 
diff --git a/bitnami/apache/docker-compose.yml b/bitnami/apache/docker-compose.yml
index 32c54c589dfb..7ce99e568afe 100644
--- a/bitnami/apache/docker-compose.yml
+++ b/bitnami/apache/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   apache:
-    image: docker.io/bitnami/apache:2.4-debian-10
+    image: docker.io/bitnami/apache:2.4
     ports:
       - 80:8080
       - 443:8443