From 7124fc7ba13c9d1a2f372aee9002f72f09ffaa2c Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 24 Jul 2020 06:34:27 +0000
Subject: [PATCH] 1.10.11-debian-10-r1 release

---
 bitnami/airflow/1/debian-10/Dockerfile        |  3 +-
 .../airflow/1/debian-10/docker-compose.yml    |  2 +-
 .../scripts/locales/add-extra-locales.sh      | 43 +++++++++++++++++++
 bitnami/airflow/README.md                     |  2 +-
 bitnami/airflow/docker-compose-ldap.yml       |  2 +-
 bitnami/airflow/docker-compose.yml            |  2 +-
 6 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100755 bitnami/airflow/1/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh

diff --git a/bitnami/airflow/1/debian-10/Dockerfile b/bitnami/airflow/1/debian-10/Dockerfile
index 69c539a91cac..37a056f39a25 100644
--- a/bitnami/airflow/1/debian-10/Dockerfile
+++ b/bitnami/airflow/1/debian-10/Dockerfile
@@ -24,6 +24,7 @@ RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \
 RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
 
 COPY rootfs /
+RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV AIRFLOW_BASE_URL="" \
     AIRFLOW_DATABASE_HOST="postgresql" \
     AIRFLOW_DATABASE_NAME="bitnami_airflow" \
@@ -57,7 +58,7 @@ ENV AIRFLOW_BASE_URL="" \
     AIRFLOW_WEBSERVER_HOST="127.0.0.1" \
     AIRFLOW_WEBSERVER_PORT_NUMBER="8080" \
     BITNAMI_APP_NAME="airflow" \
-    BITNAMI_IMAGE_VERSION="1.10.11-debian-10-r0" \
+    BITNAMI_IMAGE_VERSION="1.10.11-debian-10-r1" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     LD_LIBRARY_PATH="/opt/bitnami/python/lib/:/opt/bitnami/airflow/venv/lib/python3.6/site-packages/numpy.libs/:$LD_LIBRARY_PATH" \
diff --git a/bitnami/airflow/1/debian-10/docker-compose.yml b/bitnami/airflow/1/debian-10/docker-compose.yml
index 5838d23962d6..be874752786c 100644
--- a/bitnami/airflow/1/debian-10/docker-compose.yml
+++ b/bitnami/airflow/1/debian-10/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       - POSTGRESQL_PASSWORD=bitnami1
       - ALLOW_EMPTY_PASSWORD=yes
   redis:
-    image: docker.io/bitnami/redis:5.0-debian-10
+    image: docker.io/bitnami/redis:6.0-debian-10
     volumes:
       - 'redis_data:/bitnami'
     environment:
diff --git a/bitnami/airflow/1/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh b/bitnami/airflow/1/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh
new file mode 100755
index 000000000000..601a83c04d97
--- /dev/null
+++ b/bitnami/airflow/1/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# shellcheck disable=SC1091
+
+set -o errexit
+set -o nounset
+set -o pipefail
+# set -o xtrace # Uncomment this line for debugging purpose
+
+# Defaults
+WITH_ALL_LOCALES="${WITH_ALL_LOCALES:-no}"
+EXTRA_LOCALES="${EXTRA_LOCALES:-}"
+
+# Constants
+LOCALES_FILE="/etc/locale.gen"
+SUPPORTED_LOCALES_FILE="/usr/share/i18n/SUPPORTED"
+
+# Helper function for enabling locale only when it was not added before
+enable_locale() {
+    local -r locale="${1:?missing locale}"
+    if ! grep -q -E "^${locale}$" "$SUPPORTED_LOCALES_FILE"; then
+        echo "Locale ${locale} is not supported in this system"
+        return 1
+    fi
+    if ! grep -q -E "^${locale}" "$LOCALES_FILE"; then
+        echo "$locale" >> "$LOCALES_FILE"
+    else
+        echo "Locale ${locale} is already enabled"
+    fi
+}
+
+if [[ "$WITH_ALL_LOCALES" =~ ^(yes|true|1)$ ]]; then
+    echo "Enabling all locales"
+    cp "$SUPPORTED_LOCALES_FILE" "$LOCALES_FILE"
+else
+    LOCALES_TO_ADD="$(sed 's/[,;]\s*/\n/g' <<< "$EXTRA_LOCALES")"
+    while [[ -n "$LOCALES_TO_ADD" ]] && read -r locale; do
+        echo "Enabling locale ${locale}"
+        enable_locale "$locale"
+    done <<< "$LOCALES_TO_ADD"
+fi
+
+locale-gen
diff --git a/bitnami/airflow/README.md b/bitnami/airflow/README.md
index feafbaa669fa..0f78c06f2800 100644
--- a/bitnami/airflow/README.md
+++ b/bitnami/airflow/README.md
@@ -31,7 +31,7 @@ $ docker-compose up
 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/).
 
 
-* [`1-debian-10`, `1.10.11-debian-10-r0`, `1`, `1.10.11`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-airflow/blob/1.10.11-debian-10-r0/1/debian-10/Dockerfile)
+* [`1-debian-10`, `1.10.11-debian-10-r1`, `1`, `1.10.11`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-airflow/blob/1.10.11-debian-10-r1/1/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/airflow GitHub repo](https://github.com/bitnami/bitnami-docker-airflow).
 
diff --git a/bitnami/airflow/docker-compose-ldap.yml b/bitnami/airflow/docker-compose-ldap.yml
index cf610d567b4b..68526af47817 100644
--- a/bitnami/airflow/docker-compose-ldap.yml
+++ b/bitnami/airflow/docker-compose-ldap.yml
@@ -11,7 +11,7 @@ services:
       - POSTGRESQL_PASSWORD=bitnami1
       - ALLOW_EMPTY_PASSWORD=yes
   redis:
-    image: docker.io/bitnami/redis:5.0-debian-10
+    image: docker.io/bitnami/redis:6.0-debian-10
     volumes:
       - 'redis_data:/bitnami'
     environment:
diff --git a/bitnami/airflow/docker-compose.yml b/bitnami/airflow/docker-compose.yml
index 5838d23962d6..be874752786c 100644
--- a/bitnami/airflow/docker-compose.yml
+++ b/bitnami/airflow/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       - POSTGRESQL_PASSWORD=bitnami1
       - ALLOW_EMPTY_PASSWORD=yes
   redis:
-    image: docker.io/bitnami/redis:5.0-debian-10
+    image: docker.io/bitnami/redis:6.0-debian-10
     volumes:
       - 'redis_data:/bitnami'
     environment: