From 17b7b60b7b4425645d7a9e492236bf2ad36c6caa Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Wed, 22 Sep 2021 07:39:26 +0000
Subject: [PATCH] 2.1.4-debian-10-r3 release

---
 bitnami/airflow-worker/2/debian-10/Dockerfile               | 2 +-
 .../2/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh    | 6 +++++-
 bitnami/airflow-worker/README.md                            | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bitnami/airflow-worker/2/debian-10/Dockerfile b/bitnami/airflow-worker/2/debian-10/Dockerfile
index d37e848462ba..285d29442d35 100644
--- a/bitnami/airflow-worker/2/debian-10/Dockerfile
+++ b/bitnami/airflow-worker/2/debian-10/Dockerfile
@@ -28,7 +28,7 @@ RUN /opt/bitnami/scripts/airflow-worker/postunpack.sh
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV AIRFLOW_HOME="/opt/bitnami/airflow" \
     BITNAMI_APP_NAME="airflow-worker" \
-    BITNAMI_IMAGE_VERSION="2.1.4-debian-10-r2" \
+    BITNAMI_IMAGE_VERSION="2.1.4-debian-10-r3" \
     C_FORCE_ROOT="True" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
diff --git a/bitnami/airflow-worker/2/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh b/bitnami/airflow-worker/2/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh
index 08af9c963b7c..edd3428532a0 100644
--- a/bitnami/airflow-worker/2/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh
+++ b/bitnami/airflow-worker/2/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh
@@ -197,8 +197,12 @@ airflow_generate_config() {
     airflow_configure_database
     # Configure the Webserver port
     airflow_conf_set "webserver" "web_server_port" "$AIRFLOW_WEBSERVER_PORT_NUMBER"
-    # Setup fernet key
+    # Setup the secret keys for database connection and flask application
+    # ref: https://airflow.apache.org/docs/apache-airflow/stable/configurations-ref.html#fernet-key
+    # ref: https://airflow.apache.org/docs/apache-airflow/stable/configurations-ref.html#secret-key
     [[ -n "$AIRFLOW_FERNET_KEY" ]] && airflow_conf_set "core" "fernet_key" "$AIRFLOW_FERNET_KEY"
+    # Setup webserver key
+    [[ -n "$AIRFLOW_WEBSERVER_KEY" ]] && airflow_conf_set "webserver" "secret_key" "$AIRFLOW_WEBSERVER_KEY"
     # Configure Airflow executor
     airflow_conf_set "core" "executor" "$AIRFLOW_EXECUTOR"
     [[ "$AIRFLOW_EXECUTOR" == "CeleryExecutor" || "$AIRFLOW_EXECUTOR" == "CeleryKubernetesExecutor"  ]] && airflow_configure_celery_executor
diff --git a/bitnami/airflow-worker/README.md b/bitnami/airflow-worker/README.md
index 583fc2306974..429d3cc4fa8e 100644
--- a/bitnami/airflow-worker/README.md
+++ b/bitnami/airflow-worker/README.md
@@ -33,7 +33,7 @@ You can find the default credentials and available configuration options in the
 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`, `2-debian-10`, `2.1.4`, `2.1.4-debian-10-r2`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-airflow-worker/blob/2.1.4-debian-10-r2/2/debian-10/Dockerfile)
+* [`2`, `2-debian-10`, `2.1.4`, `2.1.4-debian-10-r3`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-airflow-worker/blob/2.1.4-debian-10-r3/2/debian-10/Dockerfile)
 * [`1`, `1-debian-10`, `1.10.15`, `1.10.15-debian-10-r167` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-airflow-worker/blob/1.10.15-debian-10-r167/1/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/airflow GitHub repo](https://github.com/bitnami/bitnami-docker-airflow-worker).