You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ep...@apache.org on 2024/02/24 13:21:01 UTC
(airflow) branch v2-8-test updated (650d29d470 -> 3e3457ed7a)
This is an automated email from the ASF dual-hosted git repository.
ephraimanierobi pushed a change to branch v2-8-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
from 650d29d470 Update to even newer version of trove classifier as build dependency (#37669)
new cb34e91691 Install latest docker CLI instead of specific one (#37651)
new 3e3457ed7a Fix regression on trigger form error display on form validation (#37672)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Dockerfile | 25 +++++++++++++------------
Dockerfile.ci | 25 +++++++++++++------------
airflow/www/views.py | 1 +
scripts/docker/install_os_dependencies.sh | 25 +++++++++++++------------
4 files changed, 40 insertions(+), 36 deletions(-)
(airflow) 02/02: Fix regression on trigger form error display on form validation (#37672)
Posted by ep...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ephraimanierobi pushed a commit to branch v2-8-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 3e3457ed7ae1b7231dfdbcb058c89be2e42a230f
Author: Jens Scheffler <95...@users.noreply.github.com>
AuthorDate: Sat Feb 24 11:28:24 2024 +0100
Fix regression on trigger form error display on form validation (#37672)
(cherry picked from commit 8f5d7d243a8398a7002744e60d09243708a08288)
---
airflow/www/views.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/airflow/www/views.py b/airflow/www/views.py
index 61d2fe584e..2334d69b8e 100644
--- a/airflow/www/views.py
+++ b/airflow/www/views.py
@@ -2230,6 +2230,7 @@ class Airflow(AirflowBaseView):
form_fields=form_fields,
**render_params,
conf=request_conf,
+ form=form,
)
flash(f"Triggered {dag_id}, it should start any moment now.")
(airflow) 01/02: Install latest docker CLI instead of specific one (#37651)
Posted by ep...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ephraimanierobi pushed a commit to branch v2-8-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit cb34e9169147979f76aa25dbbda0f68ed6c2f05a
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Fri Feb 23 10:42:50 2024 +0100
Install latest docker CLI instead of specific one (#37651)
This decreses reproducibility a bit, but it also helps to improve
security, in case some older version of docker CLI bring security
vulnerabilities.
(cherry picked from commit 2294a2f5ff8cba9fa653fcdc65f350b4dedcbf9c)
---
Dockerfile | 25 +++++++++++++------------
Dockerfile.ci | 25 +++++++++++++------------
scripts/docker/install_os_dependencies.sh | 25 +++++++++++++------------
3 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index a6b0d16d53..1ada5269c8 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 bc4533c38f..b63fd0896b 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/scripts/docker/install_os_dependencies.sh b/scripts/docker/install_os_dependencies.sh
index 5d53867643..f848846cb6 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?}