diff --git a/bitnami/airflow/2/debian-11/Dockerfile b/bitnami/airflow/2/debian-11/Dockerfile index f32b82499517..7d09be16c9d4 100644 --- a/bitnami/airflow/2/debian-11/Dockerfile +++ b/bitnami/airflow/2/debian-11/Dockerfile @@ -4,11 +4,11 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="2.3.4-debian-11-r13" \ + org.opencontainers.image.ref.name="2.4.2-debian-11-r0" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/airflow" \ org.opencontainers.image.title="airflow" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.3.4" + org.opencontainers.image.version="2.4.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -18,15 +18,15 @@ ENV HOME="/" \ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl git libbsd0 libbz2-1.0 libc6 libcom-err2 libcrypt1 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmariadb3 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libreadline8 libsasl2-2 libsasl2-modules libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 locales netbase procps zlib1g +RUN install_packages ca-certificates curl git libbsd0 libbz2-1.0 libcdt5 libcgraph6 libcom-err2 libcrypt1 libedit2 libexpat1 libffi7 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libgvc6 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 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 zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "wait-for-port-1.0.3-154-linux-${OS_ARCH}-debian-11" \ - "python-3.8.14-1-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-10.22.0-1-linux-${OS_ARCH}-debian-11" \ - "ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11" \ - "gosu-1.14.0-154-linux-${OS_ARCH}-debian-11" \ - "airflow-2.3.4-1-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.3-155-linux-${OS_ARCH}-debian-11" \ + "python-3.9.15-1-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-10.22.0-2-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.3-154-linux-${OS_ARCH}-debian-11" \ + "gosu-1.14.0-155-linux-${OS_ARCH}-debian-11" \ + "airflow-2.4.2-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -35,7 +35,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ 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}" ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ apt-get update && apt-get upgrade -y && \ @@ -45,12 +45,13 @@ RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \ DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen +RUN mkdir /.local && chmod g+rwX /.local COPY rootfs / RUN /opt/bitnami/scripts/airflow/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh ENV AIRFLOW_HOME="/opt/bitnami/airflow" \ - APP_VERSION="2.3.4" \ + APP_VERSION="2.4.2" \ BITNAMI_APP_NAME="airflow" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ diff --git a/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e2b13ec316e7..0b0c0b3b7960 100644 --- a/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,44 +1,44 @@ { "airflow": { "arch": "amd64", - "digest": "32425375517dfe654f6161c060f3eaa28181cbe3334dc793ecd9297c61900088", + "digest": "bbcfc387e9fc35290f97462a2d4f67b8c47bc17743f284716a22e6a0fc5b9cf1", "distro": "debian-11", "type": "NAMI", - "version": "2.3.4-1" + "version": "2.4.2-0" }, "gosu": { "arch": "amd64", - "digest": "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab", + "digest": "f21869b27c26b9c3053bce8b419a0fdf1dc45fcf13a7c2058e0afb6996d3687f", "distro": "debian-11", "type": "NAMI", - "version": "1.14.0-154" + "version": "1.14.0-155" }, "ini-file": { "arch": "amd64", - "digest": "4692a063a41c8382fbf1629f92bb91cc3064d50b25bddeb7e1b299c749e39afd", + "digest": "c2830edde0e37b0d97444caf3e560ac19f006b8ff6dccc8a3ac575fb3526741e", "distro": "debian-11", "type": "NAMI", - "version": "1.4.3-153" + "version": "1.4.3-154" }, "postgresql-client": { "arch": "amd64", - "digest": "7d2ae29cb7ae2a49ba0a5e192cd31d066e5451802799dcd7163a250ab5cb431f", + "digest": "73a20275bf3d884325da34dd4caba8b3365ff8ba97baf79d436e701d4b0e8bf2", "distro": "debian-11", "type": "NAMI", - "version": "10.22.0-1" + "version": "10.22.0-2" }, "python": { "arch": "amd64", - "digest": "b81946d0fc75ce5dd9518d601920b6da4b24fbd87ca81a4cbd59404dd893764f", + "digest": "ca91943ef1c9cc9637845cbb697dad40b995b7033dc03cf76c1ca03998c81c0b", "distro": "debian-11", "type": "NAMI", - "version": "3.8.14-1" + "version": "3.9.15-1" }, "wait-for-port": { "arch": "amd64", - "digest": "74a09c2208af7316f32ee3ee8479d70b20ad54f1a989e84b6417e23c1f07c147", + "digest": "8833550a6f165e2a0f1250cc327d92a3f85b151cb1f49cd0ee4bee0fdf20a21b", "distro": "debian-11", "type": "NAMI", - "version": "1.0.3-154" + "version": "1.0.3-155" } } \ No newline at end of file diff --git a/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 92530b32d94d..5e141d4ce3f1 100644 --- a/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -519,7 +519,7 @@ get_machine_id() { get_disk_device_id() { local device_id="" if grep -q ^/dev /proc/mounts; then - device_id="$(grep -q ^/dev /proc/mounts | awk '$2 == "/" { print $1 }' | tail -1)" + device_id="$(grep ^/dev /proc/mounts | awk '$2 == "/" { print $1 }' | tail -1)" fi # If it could not be autodetected, fallback to /dev/sda1 as a default if [[ -z "$device_id" || ! -b "$device_id" ]]; then @@ -538,7 +538,7 @@ get_disk_device_id() { # Root disk ID ######################### get_root_disk_device_id() { - get_disk_device_id | sed 's/[0-9]\+$//' + get_disk_device_id | sed -E 's/p?[0-9]+$//' } ######################## diff --git a/bitnami/airflow/2/debian-11/tags-info.yaml b/bitnami/airflow/2/debian-11/tags-info.yaml index 822d02719827..e1c99111c350 100644 --- a/bitnami/airflow/2/debian-11/tags-info.yaml +++ b/bitnami/airflow/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - "2-debian-11" - - "2.3.4" + - "2.4.2" - "latest" diff --git a/bitnami/airflow/README.md b/bitnami/airflow/README.md index 9741f4afa4d7..6e17e4c6fc73 100644 --- a/bitnami/airflow/README.md +++ b/bitnami/airflow/README.md @@ -32,8 +32,7 @@ $ docker-compose up Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). - -* [`2`, `2-debian-11`, `2.3.4`, `2.3.4-debian-11-r13`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/airflow/2/debian-11/Dockerfile) +You can see the equivalence between the different tags by taking a look at the `tags-info.yaml` file present in the branch folder, i.e `bitnami/ASSET/BRANCH/DISTRO/tags-info.yaml`. Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers). @@ -452,7 +451,7 @@ $ docker run -d --name airflow -p 8080:8080 \ ## Contributing -We'd love for you to contribute to this Docker image. You can request new features by creating an [issue](https://github.com/bitnami/containers/issues), or submit a [pull request](https://github.com/bitnami/containers/pulls) with your contribution. +We'd love for you to contribute to this Docker image. You can request new features by creating an [issue](https://github.com/bitnami/containers/issues) or submitting a [pull request](https://github.com/bitnami/containers/pulls) with your contribution. ## Issues