From 15f8ff09f1a9009f206fd35fe7cda8bbdb7c4af9 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 15 Jan 2021 03:48:57 +0000
Subject: [PATCH] 1.10.14-debian-10-r36 release

---
 bitnami/airflow-worker/1/debian-10/Dockerfile    | 2 +-
 bitnami/airflow-worker/1/debian-10/rootfs/run.sh | 5 ++++-
 bitnami/airflow-worker/README.md                 | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bitnami/airflow-worker/1/debian-10/Dockerfile b/bitnami/airflow-worker/1/debian-10/Dockerfile
index 5277ff9a8f89..d27395001ec1 100644
--- a/bitnami/airflow-worker/1/debian-10/Dockerfile
+++ b/bitnami/airflow-worker/1/debian-10/Dockerfile
@@ -40,7 +40,7 @@ ENV AIRFLOW_DATABASE_HOST="postgresql" \
     AIRFLOW_WEBSERVER_PORT_NUMBER="8080" \
     AIRFLOW_WORKER_PORT_NUMBER="8793" \
     BITNAMI_APP_NAME="airflow-worker" \
-    BITNAMI_IMAGE_VERSION="1.10.14-debian-10-r35" \
+    BITNAMI_IMAGE_VERSION="1.10.14-debian-10-r36" \
     C_FORCE_ROOT="True" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
diff --git a/bitnami/airflow-worker/1/debian-10/rootfs/run.sh b/bitnami/airflow-worker/1/debian-10/rootfs/run.sh
index 3cbb026817cf..428a5356f7a3 100755
--- a/bitnami/airflow-worker/1/debian-10/rootfs/run.sh
+++ b/bitnami/airflow-worker/1/debian-10/rootfs/run.sh
@@ -8,7 +8,10 @@
 USER=airflow
 DAEMON=airflow
 EXEC=$(which $DAEMON)
-START_COMMAND="${EXEC} worker ${AIRFLOW_QUEUE:+-q $AIRFLOW_QUEUE} | tee /opt/bitnami/airflow/logs/airflow-worker.log"
+AIRFLOW_COMMAND="worker"
+# Adapt airflow commant to version 2.X CLI syntax
+[[ $BITNAMI_IMAGE_VERSION =~ ^2.* ]] && AIRFLOW_COMMAND="celery ${AIRFLOW_COMMAND}"
+START_COMMAND="${EXEC} ${AIRFLOW_COMMAND} ${AIRFLOW_QUEUE:+-q $AIRFLOW_QUEUE} | tee /opt/bitnami/airflow/logs/airflow-worker.log"
 
 echo "Waiting for db..."
 counter=0;
diff --git a/bitnami/airflow-worker/README.md b/bitnami/airflow-worker/README.md
index edc8eb2fa4f7..644724480ff4 100644
--- a/bitnami/airflow-worker/README.md
+++ b/bitnami/airflow-worker/README.md
@@ -34,7 +34,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`2`, `2-debian-10`, `2.0.0`, `2.0.0-debian-10-r0` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-airflow-worker-scheduler/blob/2.0.0-debian-10-r0/2/debian-10/Dockerfile)
-* [`1`, `1-debian-10`, `1.10.14`, `1.10.14-debian-10-r35`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-airflow-worker-scheduler/blob/1.10.14-debian-10-r35/1/debian-10/Dockerfile)
+* [`1`, `1-debian-10`, `1.10.14`, `1.10.14-debian-10-r36`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-airflow-worker-scheduler/blob/1.10.14-debian-10-r36/1/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/airflow GitHub repo](https://github.com/bitnami/bitnami-docker-airflow-worker).