bitnami · bitnami-bot · Oct 30, 2024 · Oct 30, 2024
diff --git a/bitnami/airflow/2/debian-12/Dockerfile b/bitnami/airflow/2/debian-12/Dockerfile
@@ -8,11 +8,11 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-10-24T14:03:28Z" \
+      org.opencontainers.image.created="2024-10-30T14:53:31Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/airflow/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.10.2-debian-12-r3" \
+      org.opencontainers.image.ref.name="2.10.2-debian-12-r4" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/airflow" \
       org.opencontainers.image.title="airflow" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -26,12 +26,11 @@ ENV HOME="/" \
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl git krb5-user libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libedit2 libffi8 libgcc-s1 libgmp10 libgnutls30 libgss-dev libgssapi-krb5-2 libhogweed6 libicu72 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5-dev libkrb5support0 libldap-2.5-0 liblz4-1 liblzma5 libmariadb3 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libreadline8 libsasl2-2 libsasl2-modules libsqlite3-0 libssl3 libstdc++6 libsybdb5 libtasn1-6 libtinfo6 libtirpc3 libudev1 libunistring2 libuuid1 libxml2 libxslt1.1 locales netbase procps tzdata zlib1g
+RUN install_packages ca-certificates curl git krb5-user libbz2-1.0 libcom-err2 libcrypt1 libffi8 libgcc-s1 libgmp10 libgnutls30 libgss-dev libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5-dev libkrb5support0 libldap-2.5-0 liblzma5 libmariadb3 libncursesw6 libnettle8 libnsl2 libp11-kit0 libreadline8 libsasl2-2 libsasl2-modules libsqlite3-0 libssl3 libstdc++6 libsybdb5 libtasn1-6 libtinfo6 libtirpc3 libudev1 libunistring2 locales netbase procps tzdata zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "wait-for-port-1.0.8-5-linux-${OS_ARCH}-debian-12" \
-      "python-3.12.7-2-linux-${OS_ARCH}-debian-12" \
-      "postgresql-client-17.0.0-0-linux-${OS_ARCH}-debian-12" \
+      "wait-for-port-1.0.8-6-linux-${OS_ARCH}-debian-12" \
+      "python-3.12.7-3-linux-${OS_ARCH}-debian-12" \
       "ini-file-1.4.7-6-linux-${OS_ARCH}-debian-12" \
       "airflow-2.10.2-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
@@ -68,9 +67,9 @@ ENV AIRFLOW_HOME="/opt/bitnami/airflow" \
     LNAME="airflow" \
     NSS_WRAPPER_GROUP="/opt/bitnami/airflow/nss-wrapper/nss_group" \
     NSS_WRAPPER_PASSWD="/opt/bitnami/airflow/nss-wrapper/nss_passwd" \
-    PATH="/opt/bitnami/common/bin:/opt/bitnami/python/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/airflow/venv/bin:$PATH"
+    PATH="/opt/bitnami/common/bin:/opt/bitnami/python/bin:/opt/bitnami/airflow/venv/bin:$PATH"
 
-EXPOSE 8080
+EXPOSE 8080 8793
 
 USER 1001
 ENTRYPOINT [ "/opt/bitnami/scripts/airflow/entrypoint.sh" ]

diff --git a/bitnami/airflow/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/airflow/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -11,22 +11,16 @@
         "type": "NAMI",
         "version": "1.4.7-6"
     },
-    "postgresql-client": {
-        "arch": "amd64",
-        "distro": "debian-12",
-        "type": "NAMI",
-        "version": "17.0.0-0"
-    },
     "python": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "3.12.7-2"
+        "version": "3.12.7-3"
     },
     "wait-for-port": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.0.8-5"
+        "version": "1.0.8-6"
     }
 }
diff --git a/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/airflow-env.sh b/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/airflow-env.sh
@@ -29,19 +29,21 @@ airflow_env_vars=(
     AIRFLOW_FIRSTNAME
     AIRFLOW_LASTNAME
     AIRFLOW_EMAIL
+    AIRFLOW_COMPONENT_TYPE
     AIRFLOW_EXECUTOR
     AIRFLOW_RAW_FERNET_KEY
     AIRFLOW_FORCE_OVERWRITE_CONF_FILE
     AIRFLOW_FERNET_KEY
     AIRFLOW_SECRET_KEY
+    AIRFLOW_WEBSERVER_BASE_URL
     AIRFLOW_WEBSERVER_HOST
     AIRFLOW_WEBSERVER_PORT_NUMBER
     AIRFLOW_LOAD_EXAMPLES
-    AIRFLOW_BASE_URL
     AIRFLOW_HOSTNAME_CALLABLE
     AIRFLOW_POOL_NAME
     AIRFLOW_POOL_SIZE
     AIRFLOW_POOL_DESC
+    AIRFLOW_WORKER_QUEUE
     AIRFLOW_DATABASE_HOST
     AIRFLOW_DATABASE_PORT_NUMBER
     AIRFLOW_DATABASE_NAME
@@ -67,6 +69,8 @@ airflow_env_vars=(
     AIRFLOW_LDAP_USE_TLS
     AIRFLOW_LDAP_ALLOW_SELF_SIGNED
     AIRFLOW_LDAP_TLS_CA_CERTIFICATE
+    AIRFLOW_BASE_URL
+    AIRFLOW_QUEUE
 )
 for env_var in "${airflow_env_vars[@]}"; do
     file_env_var="${env_var}_FILE"
@@ -83,15 +87,13 @@ unset airflow_env_vars
 
 # Airflow paths
 export AIRFLOW_BASE_DIR="${BITNAMI_ROOT_DIR}/airflow"
-export AIRFLOW_HOME="${AIRFLOW_BASE_DIR}"
+export AIRFLOW_HOME="$AIRFLOW_BASE_DIR"
 export AIRFLOW_BIN_DIR="${AIRFLOW_BASE_DIR}/venv/bin"
 export AIRFLOW_LOGS_DIR="${AIRFLOW_BASE_DIR}/logs"
 export AIRFLOW_SCHEDULER_LOGS_DIR="${AIRFLOW_LOGS_DIR}/scheduler"
-export AIRFLOW_LOG_FILE="${AIRFLOW_LOGS_DIR}/airflow-webserver.log"
 export AIRFLOW_CONF_FILE="${AIRFLOW_BASE_DIR}/airflow.cfg"
 export AIRFLOW_WEBSERVER_CONF_FILE="${AIRFLOW_BASE_DIR}/webserver_config.py"
 export AIRFLOW_TMP_DIR="${AIRFLOW_BASE_DIR}/tmp"
-export AIRFLOW_PID_FILE="${AIRFLOW_TMP_DIR}/airflow-webserver.pid"
 export AIRFLOW_DAGS_DIR="${AIRFLOW_BASE_DIR}/dags"
 export PATH="${AIRFLOW_BIN_DIR}:${BITNAMI_ROOT_DIR}/common/bin:${PATH}"
 
@@ -107,19 +109,23 @@ export AIRFLOW_LASTNAME="${AIRFLOW_LASTNAME:-Lastname}"
 export AIRFLOW_EMAIL="${AIRFLOW_EMAIL:-user@example.com}"
 
 # Airflow configuration
+export AIRFLOW_COMPONENT_TYPE="${AIRFLOW_COMPONENT_TYPE:-webserver}"
 export AIRFLOW_EXECUTOR="${AIRFLOW_EXECUTOR:-SequentialExecutor}"
 export AIRFLOW_RAW_FERNET_KEY="${AIRFLOW_RAW_FERNET_KEY:-}"
 export AIRFLOW_FORCE_OVERWRITE_CONF_FILE="${AIRFLOW_FORCE_OVERWRITE_CONF_FILE:-no}"
 export AIRFLOW_FERNET_KEY="${AIRFLOW_FERNET_KEY:-}"
 export AIRFLOW_SECRET_KEY="${AIRFLOW_SECRET_KEY:-}"
+AIRFLOW_WEBSERVER_BASE_URL="${AIRFLOW_WEBSERVER_BASE_URL:-"${AIRFLOW_BASE_URL:-}"}"
+export AIRFLOW_WEBSERVER_BASE_URL="${AIRFLOW_WEBSERVER_BASE_URL:-}"
 export AIRFLOW_WEBSERVER_HOST="${AIRFLOW_WEBSERVER_HOST:-127.0.0.1}"
 export AIRFLOW_WEBSERVER_PORT_NUMBER="${AIRFLOW_WEBSERVER_PORT_NUMBER:-8080}"
 export AIRFLOW_LOAD_EXAMPLES="${AIRFLOW_LOAD_EXAMPLES:-yes}"
-export AIRFLOW_BASE_URL="${AIRFLOW_BASE_URL:-}"
 export AIRFLOW_HOSTNAME_CALLABLE="${AIRFLOW_HOSTNAME_CALLABLE:-}"
 export AIRFLOW_POOL_NAME="${AIRFLOW_POOL_NAME:-}"
 export AIRFLOW_POOL_SIZE="${AIRFLOW_POOL_SIZE:-}"
 export AIRFLOW_POOL_DESC="${AIRFLOW_POOL_DESC:-}"
+AIRFLOW_WORKER_QUEUE="${AIRFLOW_WORKER_QUEUE:-"${AIRFLOW_QUEUE:-}"}"
+export AIRFLOW_WORKER_QUEUE="${AIRFLOW_WORKER_QUEUE:-}"
 
 # Airflow database configuration
 export AIRFLOW_DATABASE_HOST="${AIRFLOW_DATABASE_HOST:-postgresql}"

diff --git a/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/airflow/entrypoint.sh b/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/airflow/entrypoint.sh
@@ -36,7 +36,6 @@ fi
 
 if [[ "$*" = *"/opt/bitnami/scripts/airflow/run.sh"* || "$*" = *"/run.sh"* ]]; then
     info "** Starting Airflow setup **"
-    /opt/bitnami/scripts/postgresql-client/setup.sh
     /opt/bitnami/scripts/airflow/setup.sh
     info "** Airflow setup finished! **"
 fi

diff --git a/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/airflow/run.sh b/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/airflow/run.sh
@@ -16,11 +16,17 @@ set -o pipefail
 . /opt/bitnami/scripts/libos.sh
 . /opt/bitnami/scripts/libairflow.sh
 
-args=("--pid" "$AIRFLOW_PID_FILE" "$@")
+command=("$AIRFLOW_COMPONENT_TYPE")
+args=("--pid" "${AIRFLOW_TMP_DIR}/airflow-${AIRFLOW_COMPONENT_TYPE}.pid" "$@")
+if [[ "$AIRFLOW_COMPONENT_TYPE" = "worker" ]]; then
+    command=("celery" "worker")
+    [[ -n "$AIRFLOW_WORKER_QUEUE" ]] && args+=("-q" "$AIRFLOW_WORKER_QUEUE")
+    am_i_root && export C_FORCE_ROOT="true"
+fi
 
 info "** Starting Airflow **"
 if am_i_root; then
-    exec_as_user "$AIRFLOW_DAEMON_USER" "${AIRFLOW_BIN_DIR}/airflow" "webserver" "${args[@]}"
+    exec_as_user "$AIRFLOW_DAEMON_USER" "${AIRFLOW_BIN_DIR}/airflow" "${command[@]}" "${args[@]}"
 else
-    exec "${AIRFLOW_BIN_DIR}/airflow" "webserver" "${args[@]}"
+    exec "${AIRFLOW_BIN_DIR}/airflow" "${command[@]}" "${args[@]}"
 fi
diff --git a/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/airflow/setup.sh b/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/airflow/setup.sh
@@ -12,13 +12,6 @@ set -o pipefail
 # Load Airflow environment variables
 . /opt/bitnami/scripts/airflow-env.sh
 
-# Load PostgreSQL Client environment for 'postgresql_remote_execute' (after 'airflow-env.sh' so that MODULE is not set to a wrong value)
-if [[ -f /opt/bitnami/scripts/postgresql-client-env.sh ]]; then
-    . /opt/bitnami/scripts/postgresql-client-env.sh
-elif [[ -f /opt/bitnami/scripts/postgresql-env.sh ]]; then
-    . /opt/bitnami/scripts/postgresql-env.sh
-fi
-
 # Load libraries
 . /opt/bitnami/scripts/libos.sh
 . /opt/bitnami/scripts/libfs.sh