From d459c7d600622ffd372e887dfaae30923927aa2e Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Thu, 7 Dec 2023 11:40:34 +0000 Subject: [PATCH] [bitnami/airflow-worker] Release 2.7.3-debian-11-r4 Signed-off-by: Bitnami Containers --- bitnami/airflow-worker/2/debian-11/Dockerfile | 18 +++++++++--------- .../opt/bitnami/.bitnami_components.json | 2 +- .../2/debian-11/prebuildfs/usr/sbin/run-script | 2 +- .../rootfs/opt/bitnami/scripts/libairflow.sh | 4 ++-- bitnami/airflow-worker/README.md | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bitnami/airflow-worker/2/debian-11/Dockerfile b/bitnami/airflow-worker/2/debian-11/Dockerfile index b0d9673359d8f..0658eec55f603 100644 --- a/bitnami/airflow-worker/2/debian-11/Dockerfile +++ b/bitnami/airflow-worker/2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-11-21T14:51:43Z" \ + org.opencontainers.image.created="2023-12-02T11:50:16Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.7.3-debian-11-r2" \ + org.opencontainers.image.ref.name="2.7.3-debian-11-r4" \ org.opencontainers.image.title="airflow-worker" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.7.3" @@ -21,24 +21,24 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +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 libcdt5 libcgraph6 libcom-err2 libcrypt1 libedit2 libexpat1 libffi7 libgcc-s1 libgmp10 libgnutls30 libgss-dev libgssapi-krb5-2 libgvc6 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5-dev libkrb5support0 libldap-2.4-2 libltdl7 liblz4-1 liblzma5 libmariadb3 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpathplan4 libreadline8 libsasl2-2 libsasl2-modules libsqlite3-0 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 locales netbase procps tzdata zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ - "python-3.11.6-10-linux-${OS_ARCH}-debian-11" \ + "python-3.11.6-11-linux-${OS_ARCH}-debian-11" \ "postgresql-client-16.1.0-0-linux-${OS_ARCH}-debian-11" \ "ini-file-1.4.6-3-linux-${OS_ARCH}-debian-11" \ "airflow-worker-2.7.3-5-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/airflow-worker/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/airflow-worker/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 45cafc3efb8cd..f905a1272b5ea 100644 --- a/bitnami/airflow-worker/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/airflow-worker/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -21,7 +21,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-10" + "version": "3.11.6-11" }, "wait-for-port": { "arch": "amd64", diff --git a/bitnami/airflow-worker/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/airflow-worker/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/airflow-worker/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/airflow-worker/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/airflow-worker/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh b/bitnami/airflow-worker/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh index be3f4b0cb488b..b21d4cb26ed70 100644 --- a/bitnami/airflow-worker/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh +++ b/bitnami/airflow-worker/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh @@ -185,8 +185,8 @@ airflow_execute() { ######################### airflow_generate_config() { # Create Airflow confirguration from default files - cp "$(find "$AIRFLOW_BASE_DIR" -name default_airflow.cfg)" "$AIRFLOW_CONF_FILE" - [[ -n "$AIRFLOW_WEBSERVER_CONF_FILE" ]] && cp "$(find "$AIRFLOW_BASE_DIR" -name default_webserver_config.py)" "$AIRFLOW_WEBSERVER_CONF_FILE" + [[ ! -f "$AIRFLOW_CONF_FILE" ]] && cp "$(find "$AIRFLOW_BASE_DIR" -name default_airflow.cfg)" "$AIRFLOW_CONF_FILE" + [[ -n "$AIRFLOW_WEBSERVER_CONF_FILE" ]] && [[ ! -f "$AIRFLOW_WEBSERVER_CONF_FILE" ]] && cp "$(find "$AIRFLOW_BASE_DIR" -name default_webserver_config.py)" "$AIRFLOW_WEBSERVER_CONF_FILE" # Setup Airflow base URL airflow_configure_base_url diff --git a/bitnami/airflow-worker/README.md b/bitnami/airflow-worker/README.md index eb78fd4a7520c..1a945e683c87e 100644 --- a/bitnami/airflow-worker/README.md +++ b/bitnami/airflow-worker/README.md @@ -1,4 +1,4 @@ -# Apache Airflow Worker packaged by Bitnami +# Bitnami package for Apache Airflow Worker ## What is Apache Airflow Worker? @@ -23,7 +23,7 @@ You can find the default credentials and available configuration options in the * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available.