From 412ffb7dee00955d00d4035a57f580e9672b8bdb Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 7 Nov 2024 17:20:57 +0100 Subject: [PATCH] [bitnami/airflow] Release airflow-2.10.3-debian-12-r1 (#74341) Signed-off-by: Bitnami Bot --- bitnami/airflow/2/debian-12/Dockerfile | 10 +++++----- bitnami/airflow/2/debian-12/docker-compose.yml | 6 ++++-- .../opt/bitnami/.bitnami_components.json | 6 +++--- .../rootfs/opt/bitnami/scripts/libairflow.sh | 18 +++++++++++------- bitnami/airflow/docker-compose-ldap.yml | 6 ++++-- bitnami/airflow/docker-compose.yml | 6 ++++-- 6 files changed, 31 insertions(+), 21 deletions(-) diff --git a/bitnami/airflow/2/debian-12/Dockerfile b/bitnami/airflow/2/debian-12/Dockerfile index c95978ee8b01..ddbe1583e1f3 100644 --- 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-11-05T17:05:12Z" \ + org.opencontainers.image.created="2024-11-07T15:00:03Z" \ 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.3-debian-12-r0" \ + org.opencontainers.image.ref.name="2.10.3-debian-12-r1" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/airflow" \ org.opencontainers.image.title="airflow" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -29,10 +29,10 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] 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 openssh-client procps tzdata zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.8-6-linux-${OS_ARCH}-debian-12" \ + "wait-for-port-1.0.8-7-linux-${OS_ARCH}-debian-12" \ "python-3.12.7-4-linux-${OS_ARCH}-debian-12" \ - "ini-file-1.4.7-6-linux-${OS_ARCH}-debian-12" \ - "airflow-2.10.3-0-linux-${OS_ARCH}-debian-12" \ + "ini-file-1.4.7-7-linux-${OS_ARCH}-debian-12" \ + "airflow-2.10.3-1-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/airflow/2/debian-12/docker-compose.yml b/bitnami/airflow/2/debian-12/docker-compose.yml index c8c255401d71..f2a0c89e6fee 100644 --- a/bitnami/airflow/2/debian-12/docker-compose.yml +++ b/bitnami/airflow/2/debian-12/docker-compose.yml @@ -20,16 +20,18 @@ services: # ALLOW_EMPTY_PASSWORD is recommended only for development. - ALLOW_EMPTY_PASSWORD=yes airflow-scheduler: - image: docker.io/bitnami/airflow-scheduler:2 + image: docker.io/bitnami/airflow:2 environment: + - AIRFLOW_COMPONENT_TYPE=scheduler - AIRFLOW_DATABASE_NAME=bitnami_airflow - AIRFLOW_DATABASE_USERNAME=bn_airflow - AIRFLOW_DATABASE_PASSWORD=bitnami1 - AIRFLOW_EXECUTOR=CeleryExecutor - AIRFLOW_WEBSERVER_HOST=airflow airflow-worker: - image: docker.io/bitnami/airflow-worker:2 + image: docker.io/bitnami/airflow:2 environment: + - AIRFLOW_COMPONENT_TYPE=worker - AIRFLOW_DATABASE_NAME=bitnami_airflow - AIRFLOW_DATABASE_USERNAME=bn_airflow - AIRFLOW_DATABASE_PASSWORD=bitnami1 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 index 7eb584f23b3f..5cecdeb33e39 100644 --- a/bitnami/airflow/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/airflow/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,13 +3,13 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "2.10.3-0" + "version": "2.10.3-1" }, "ini-file": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.4.7-6" + "version": "1.4.7-7" }, "python": { "arch": "amd64", @@ -21,6 +21,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.8-6" + "version": "1.0.8-7" } } \ No newline at end of file diff --git a/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/libairflow.sh b/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/libairflow.sh index 2bde85f03fc4..4aa2be190431 100644 --- a/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/libairflow.sh +++ b/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/libairflow.sh @@ -470,7 +470,7 @@ airflow_configure_database() { # None ######################### airflow_encode_url() { - local -r url="${1?Missing url}" + local -r url="${1:?Missing url}" urlencode() { old_lc_collate="${LC_COLLATE:-}" @@ -567,13 +567,15 @@ airflow_create_pool() { # Globals: # AIRFLOW_TMP_DIR # Arguments: -# None +# 1 - PID file # Returns: # Whether Airflow is running ######################## is_airflow_running() { + local -r pid_file="${1:?Missing pid file}" + local pid - pid="$(get_pid_from_file "${AIRFLOW_TMP_DIR}/airflow-webserver.pid")" + pid="$(get_pid_from_file "${AIRFLOW_TMP_DIR}/${pid_file}")" if [[ -n "$pid" ]]; then is_service_running "$pid" else @@ -586,12 +588,12 @@ is_airflow_running() { # Globals: # AIRFLOW_TMP_DIR # Arguments: -# None +# 1 - PID file # Returns: # Whether Airflow is not running ######################## is_airflow_not_running() { - ! is_airflow_running + ! is_airflow_running "$@" } ######################## @@ -599,13 +601,15 @@ is_airflow_not_running() { # Globals: # AIRFLOW_TMP_DIR # Arguments: -# None +# 1 - PID file # Returns: # None ######################### airflow_stop() { + local -r pid_file="${1:?Missing pid file}" + info "Stopping Airflow..." - stop_service_using_pid "${AIRFLOW_TMP_DIR}/airflow-webserver.pid" + stop_service_using_pid "${AIRFLOW_TMP_DIR}/${pid_file}" } ######################## diff --git a/bitnami/airflow/docker-compose-ldap.yml b/bitnami/airflow/docker-compose-ldap.yml index e6aef3c9e4c5..87ab7ea0ec43 100644 --- a/bitnami/airflow/docker-compose-ldap.yml +++ b/bitnami/airflow/docker-compose-ldap.yml @@ -18,8 +18,9 @@ services: environment: - ALLOW_EMPTY_PASSWORD=yes airflow-scheduler: - image: docker.io/bitnami/airflow-scheduler:2 + image: docker.io/bitnami/airflow:2 environment: + - AIRFLOW_COMPONENT_TYPE=scheduler - AIRFLOW_DATABASE_NAME=bitnami_airflow - AIRFLOW_DATABASE_USERNAME=bn_airflow - AIRFLOW_DATABASE_PASSWORD=bitnami1 @@ -28,8 +29,9 @@ services: volumes: - airflow_scheduler_data:/bitnami airflow-worker: - image: docker.io/bitnami/airflow-worker:2 + image: docker.io/bitnami/airflow:2 environment: + - AIRFLOW_COMPONENT_TYPE=worker - AIRFLOW_DATABASE_NAME=bitnami_airflow - AIRFLOW_DATABASE_USERNAME=bn_airflow - AIRFLOW_DATABASE_PASSWORD=bitnami1 diff --git a/bitnami/airflow/docker-compose.yml b/bitnami/airflow/docker-compose.yml index c8c255401d71..f2a0c89e6fee 100644 --- a/bitnami/airflow/docker-compose.yml +++ b/bitnami/airflow/docker-compose.yml @@ -20,16 +20,18 @@ services: # ALLOW_EMPTY_PASSWORD is recommended only for development. - ALLOW_EMPTY_PASSWORD=yes airflow-scheduler: - image: docker.io/bitnami/airflow-scheduler:2 + image: docker.io/bitnami/airflow:2 environment: + - AIRFLOW_COMPONENT_TYPE=scheduler - AIRFLOW_DATABASE_NAME=bitnami_airflow - AIRFLOW_DATABASE_USERNAME=bn_airflow - AIRFLOW_DATABASE_PASSWORD=bitnami1 - AIRFLOW_EXECUTOR=CeleryExecutor - AIRFLOW_WEBSERVER_HOST=airflow airflow-worker: - image: docker.io/bitnami/airflow-worker:2 + image: docker.io/bitnami/airflow:2 environment: + - AIRFLOW_COMPONENT_TYPE=worker - AIRFLOW_DATABASE_NAME=bitnami_airflow - AIRFLOW_DATABASE_USERNAME=bn_airflow - AIRFLOW_DATABASE_PASSWORD=bitnami1