[bitnami/airflow-worker] Release 2.5.2-debian-11-r1 (#27551)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
2026-02-13 07:47:15 +08:00 · 2023-03-18 23:00:47 +01:00
parent 97f4f31f8a
commit 0608fc7c70
3 changed files with 58 additions and 25 deletions
--- a/bitnami/airflow-worker/2/debian-11/Dockerfile
+++ b/bitnami/airflow-worker/2/debian-11/Dockerfile
@@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG TARGETARCH

 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-03-15T01:49:30Z" \
+      org.opencontainers.image.created="2023-03-18T20:36:07Z" \
      org.opencontainers.image.description="Application packaged by VMware, Inc" \
      org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.5.2-debian-11-r0" \
+      org.opencontainers.image.ref.name="2.5.2-debian-11-r1" \
      org.opencontainers.image.title="airflow-worker" \
      org.opencontainers.image.vendor="VMware, Inc." \
      org.opencontainers.image.version="2.5.2"
@@ -19,15 +19,15 @@ ENV HOME="/" \
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl 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 liblzma5 libmariadb3 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpathplan4 libpq5 libreadline8 libsasl2-2 libsasl2-modules libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 locales netbase procps tzdata zlib1g
+RUN install_packages ca-certificates curl 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 liblzma5 libmariadb3 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpathplan4 libreadline8 libsasl2-2 libsasl2-modules libsqlite3-0 libssl1.1 libstdc++6 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/ && \
    COMPONENTS=( \
-      "wait-for-port-1.0.6-1-linux-${OS_ARCH}-debian-11" \
-      "python-3.9.16-7-linux-${OS_ARCH}-debian-11" \
-      "postgresql-client-15.2.0-1-linux-${OS_ARCH}-debian-11" \
-      "ini-file-1.4.5-1-linux-${OS_ARCH}-debian-11" \
-      "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
-      "airflow-worker-2.5.2-0-linux-${OS_ARCH}-debian-11" \
+      "wait-for-port-1.0.6-2-linux-${OS_ARCH}-debian-11" \
+      "python-3.9.16-8-linux-${OS_ARCH}-debian-11" \
+      "postgresql-client-15.2.0-2-linux-${OS_ARCH}-debian-11" \
+      "ini-file-1.4.5-2-linux-${OS_ARCH}-debian-11" \
+      "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \
+      "airflow-worker-2.5.2-1-linux-${OS_ARCH}-debian-11" \
    ) && \
    for COMPONENT in "${COMPONENTS[@]}"; do \
      if [ ! -f "${COMPONENT}.tar.gz" ]; then \
--- 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
@@ -1,44 +1,44 @@
 {
    "airflow-worker": {
        "arch": "amd64",
-        "digest": "8366025824d344b6a6f6361f9930fce738a60263412906611f26a8483ccc5e19",
+        "digest": "4f4a31f4f8d78a540290af3cbd1423ec94f577f8734db3b2bfb1f019267c765f",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "2.5.2-0"
+        "version": "2.5.2-1"
    },
    "gosu": {
        "arch": "amd64",
-        "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa",
+        "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "1.16.0-2"
+        "version": "1.16.0-3"
    },
    "ini-file": {
        "arch": "amd64",
-        "digest": "75d5f74f62ca3a476e5ffc01715b197ba18c3b45a85b18fb61cc68e998616119",
+        "digest": "c75066994058575c6092fb760bd53feeb2aabd6039e942f3904de57f5a5534dc",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "1.4.5-1"
+        "version": "1.4.5-2"
    },
    "postgresql-client": {
        "arch": "amd64",
-        "digest": "29659c3d87558bf03d65ffd4dfd4fee76cc89e05ec0ac595e26dc72b8e15dc14",
+        "digest": "f30b5782e06f5a81190143d77d76c364a73836ffa635b349478dcc1bee6b06ed",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "15.2.0-1"
+        "version": "15.2.0-2"
    },
    "python": {
        "arch": "amd64",
-        "digest": "c369ac87c1fde791afbe4126cbb5b95b5f031eb635c864658952def95f688dba",
+        "digest": "7356ba4f9823199ca5819c7f814ed7d971c3fe916726bb53d8b929414c5b3e2b",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "3.9.16-7"
+        "version": "3.9.16-8"
    },
    "wait-for-port": {
        "arch": "amd64",
-        "digest": "be7c393d598ddf16d1c3c008a67b87879e48aca62071a208583390f2b41e6744",
+        "digest": "66c83aadf646d230d0cb097d9fe1663911bed94fabf8cbba2a17c39f7c6ffbcc",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "1.0.6-1"
+        "version": "1.0.6-2"
    }
 }
--- a/bitnami/airflow-worker/2/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/airflow-worker/2/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -281,6 +281,8 @@ remove_logrotate_conf() {
 #   --environment - Environment variable to define (multiple --environment options may be passed)
 #   --environment-file - Text file with environment variables
 #   --exec-start - Start command (required)
+#   --exec-start-pre - Pre-start command (optional)
+#   --exec-start-post - Post-start command (optional)
 #   --exec-stop - Stop command (optional)
 #   --exec-reload - Reload command (optional)
 #   --group - System group to start the service with
@@ -292,6 +294,7 @@ remove_logrotate_conf() {
 #   --success-exit-status - Exit code that indicates a successful shutdown
 #   --type - Systemd unit type (defaults to forking)
 #   --user - System user to start the service with
+#   --working-directory - Working directory at which to start the service
 # Returns:
 #   None
 #########################
@@ -307,6 +310,8 @@ generate_systemd_conf() {
    local environment=""
    local environment_file=""
    local exec_start=""
+    local exec_start_pre=""
+    local exec_start_post=""
    local exec_stop=""
    local exec_reload=""
    local restart="always"
@@ -316,6 +321,7 @@ generate_systemd_conf() {
    local limits_content=""
    local success_exit_status=""
    local custom_service_content=""
+    local working_directory=""
    # Parse CLI flags
    shift
    while [[ "$#" -gt 0 ]]; do
@@ -334,6 +340,7 @@ generate_systemd_conf() {
            | --standard-error \
            | --success-exit-status \
            | --custom-service-content \
+            | --working-directory \
            )
                var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
                shift
@@ -345,11 +352,21 @@ generate_systemd_conf() {
                shift
                limits_content+="Limit${var_name^^}=${1:?"--limit-${var_name} value is missing"}"
                ;;
+            --exec-start-pre)
+                shift
+                [[ -n "$exec_start_pre" ]] && exec_start_pre+=$'\n'
+                exec_start_pre+="ExecStartPre=${1:?"--exec-start-pre value is missing"}"
+                ;;
+            --exec-start-post)
+                shift
+                [[ -n "$exec_start_post" ]] && exec_start_post+=$'\n'
+                exec_start_post+="ExecStartPost=${1:?"--exec-start-post value is missing"}"
+                ;;
            --environment)
                shift
                # It is possible to add multiple environment lines
                [[ -n "$environment" ]] && environment+=$'\n'
-                environment+="Environment=${1:?"environment" is missing}"
+                environment+="Environment=${1:?"--environment value is missing"}"
                ;;
            *)
                echo "Invalid command line flag ${1}" >&2
@@ -376,8 +393,21 @@ PartOf=bitnami.service

 [Service]
 Type=${type}
-ExecStart=${exec_start}
 EOF
+    if [[ -n "$working_directory" ]]; then
+        cat >> "$service_file" <<< "WorkingDirectory=$working_directory"
+    fi
+    if [[ -n "$exec_start_pre" ]]; then
+        # This variable may contain multiple ExecStartPre= directives
+        cat >> "$service_file" <<< "$exec_start_pre"
+    fi
+    if [[ -n "$exec_start" ]]; then
+        cat >> "$service_file" <<< "ExecStart=${exec_start}"
+    fi
+    if [[ -n "$exec_start_post" ]]; then
+        # This variable may contain multiple ExecStartPost= directives
+        cat >> "$service_file" <<< "$exec_start_post"
+    fi
    # Optional stop and reload commands
    if [[ -n "$exec_stop" ]]; then
        cat >> "$service_file" <<< "ExecStop=${exec_stop}"
@@ -399,8 +429,9 @@ EOF
    if [[ -n "$restart" ]]; then
        cat >> "$service_file" <<< "Restart=${restart}"
    fi
-    # Environment flags (may be specified multiple times in a unit)
+    # Environment flags
    if [[ -n "$environment" ]]; then
+        # This variable may contain multiple Environment= directives
        cat >> "$service_file" <<< "$environment"
    fi
    if [[ -n "$environment_file" ]]; then
@@ -414,6 +445,7 @@ EOF
        cat >> "$service_file" <<< "StandardError=${standard_error}"
    fi
    if [[ -n "$custom_service_content" ]]; then
+        # This variable may contain multiple miscellaneous directives
        cat >> "$service_file" <<< "$custom_service_content"
    fi
    if [[ -n "$success_exit_status" ]]; then
@@ -424,7 +456,8 @@ EOF
    fi
    cat >> "$service_file" <<EOF
 # Optimizations
-TimeoutSec=5min
+TimeoutStartSec=2min
+TimeoutStopSec=30s
 IgnoreSIGPIPE=no
 KillMode=mixed
 EOF