diff --git a/Dockerfile b/Dockerfile index a6b0d16d5371c..1ada5269c8176 100644 --- a/Dockerfile +++ b/Dockerfile @@ -76,8 +76,6 @@ COPY <<"EOF" /install_os_dependencies.sh #!/usr/bin/env bash set -euo pipefail -DOCKER_CLI_VERSION=24.0.6 - if [[ "$#" != 1 ]]; then echo "ERROR! There should be 'runtime' or 'dev' parameter passed as argument.". exit 1 @@ -130,20 +128,23 @@ lsb-release openssh-client python3-selinux rsync sasl2-bin sqlite3 sudo unixodbc } function install_docker_cli() { - local platform - if [[ $(uname -m) == "arm64" || $(uname -m) == "aarch64" ]]; then - platform="aarch64" - else - platform="x86_64" - fi - curl --silent \ - "https://download.docker.com/linux/static/stable/${platform}/docker-${DOCKER_CLI_VERSION}.tgz" \ - | tar -C /usr/bin --strip-components=1 -xvzf - docker/docker + apt-get update + apt-get install ca-certificates curl + install -m 0755 -d /etc/apt/keyrings + curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc + chmod a+r /etc/apt/keyrings/docker.asc + # shellcheck disable=SC1091 + echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \ + $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ + tee /etc/apt/sources.list.d/docker.list > /dev/null + apt-get update + apt-get install -y --no-install-recommends docker-ce-cli } function install_debian_dev_dependencies() { apt-get update - apt-get install --no-install-recommends -yqq apt-utils >/dev/null 2>&1 + apt-get install -yqq --no-install-recommends apt-utils >/dev/null 2>&1 apt-get install -y --no-install-recommends curl gnupg2 lsb-release # shellcheck disable=SC2086 export ${ADDITIONAL_DEV_APT_ENV?} diff --git a/Dockerfile.ci b/Dockerfile.ci index bc4533c38f2f5..b63fd0896b131 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -36,8 +36,6 @@ COPY <<"EOF" /install_os_dependencies.sh #!/usr/bin/env bash set -euo pipefail -DOCKER_CLI_VERSION=24.0.6 - if [[ "$#" != 1 ]]; then echo "ERROR! There should be 'runtime' or 'dev' parameter passed as argument.". exit 1 @@ -90,20 +88,23 @@ lsb-release openssh-client python3-selinux rsync sasl2-bin sqlite3 sudo unixodbc } function install_docker_cli() { - local platform - if [[ $(uname -m) == "arm64" || $(uname -m) == "aarch64" ]]; then - platform="aarch64" - else - platform="x86_64" - fi - curl --silent \ - "https://download.docker.com/linux/static/stable/${platform}/docker-${DOCKER_CLI_VERSION}.tgz" \ - | tar -C /usr/bin --strip-components=1 -xvzf - docker/docker + apt-get update + apt-get install ca-certificates curl + install -m 0755 -d /etc/apt/keyrings + curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc + chmod a+r /etc/apt/keyrings/docker.asc + # shellcheck disable=SC1091 + echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \ + $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ + tee /etc/apt/sources.list.d/docker.list > /dev/null + apt-get update + apt-get install -y --no-install-recommends docker-ce-cli } function install_debian_dev_dependencies() { apt-get update - apt-get install --no-install-recommends -yqq apt-utils >/dev/null 2>&1 + apt-get install -yqq --no-install-recommends apt-utils >/dev/null 2>&1 apt-get install -y --no-install-recommends curl gnupg2 lsb-release # shellcheck disable=SC2086 export ${ADDITIONAL_DEV_APT_ENV?} diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst index 65be0c6197663..0fea7c09025c0 100644 --- a/RELEASE_NOTES.rst +++ b/RELEASE_NOTES.rst @@ -120,6 +120,7 @@ Bug Fixes Miscellaneous """"""""""""" +- Install latest docker ``CLI`` instead of specific one (#37651) - Bump ``undici`` from ``5.26.3`` to ``5.28.3`` in ``/airflow/www`` (#37493) - Add Python ``3.12`` exclusions in ``providers/pyproject.toml`` (#37404) - Remove ``markdown`` from core dependencies (#37396) diff --git a/airflow/reproducible_build.yaml b/airflow/reproducible_build.yaml index dfd62eeeb2031..346ed5d1d70e3 100644 --- a/airflow/reproducible_build.yaml +++ b/airflow/reproducible_build.yaml @@ -1,2 +1,2 @@ -release-notes-hash: b144986c574af11f9fbdc7b66d2e22d3 -source-date-epoch: 1708637085 +release-notes-hash: e9074c5f236fefdaf03cfc8d1a75e23d +source-date-epoch: 1708781201 diff --git a/airflow/www/views.py b/airflow/www/views.py index 61d2fe584ef88..2334d69b8e36a 100644 --- a/airflow/www/views.py +++ b/airflow/www/views.py @@ -2230,6 +2230,7 @@ def trigger(self, dag_id: str, session: Session = NEW_SESSION): form_fields=form_fields, **render_params, conf=request_conf, + form=form, ) flash(f"Triggered {dag_id}, it should start any moment now.") diff --git a/pyproject.toml b/pyproject.toml index 5849183774f48..1f2a70c862e92 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ requires = [ "pluggy==1.4.0", "smmap==5.0.1", "tomli==2.0.1; python_version < '3.11'", - "trove-classifiers==2024.2.22", + "trove-classifiers==2024.2.23", ] build-backend = "hatchling.build" diff --git a/scripts/docker/install_os_dependencies.sh b/scripts/docker/install_os_dependencies.sh index 5d53867643287..f848846cb63e3 100644 --- a/scripts/docker/install_os_dependencies.sh +++ b/scripts/docker/install_os_dependencies.sh @@ -18,8 +18,6 @@ # shellcheck shell=bash set -euo pipefail -DOCKER_CLI_VERSION=24.0.6 - if [[ "$#" != 1 ]]; then echo "ERROR! There should be 'runtime' or 'dev' parameter passed as argument.". exit 1 @@ -72,20 +70,23 @@ lsb-release openssh-client python3-selinux rsync sasl2-bin sqlite3 sudo unixodbc } function install_docker_cli() { - local platform - if [[ $(uname -m) == "arm64" || $(uname -m) == "aarch64" ]]; then - platform="aarch64" - else - platform="x86_64" - fi - curl --silent \ - "https://download.docker.com/linux/static/stable/${platform}/docker-${DOCKER_CLI_VERSION}.tgz" \ - | tar -C /usr/bin --strip-components=1 -xvzf - docker/docker + apt-get update + apt-get install ca-certificates curl + install -m 0755 -d /etc/apt/keyrings + curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc + chmod a+r /etc/apt/keyrings/docker.asc + # shellcheck disable=SC1091 + echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \ + $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ + tee /etc/apt/sources.list.d/docker.list > /dev/null + apt-get update + apt-get install -y --no-install-recommends docker-ce-cli } function install_debian_dev_dependencies() { apt-get update - apt-get install --no-install-recommends -yqq apt-utils >/dev/null 2>&1 + apt-get install -yqq --no-install-recommends apt-utils >/dev/null 2>&1 apt-get install -y --no-install-recommends curl gnupg2 lsb-release # shellcheck disable=SC2086 export ${ADDITIONAL_DEV_APT_ENV?}