This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v2-9-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 99a64c4e827d9fad33b122f225f97dc2816b2d60 Author: Andrey Anshin <andrey.ans...@taragol.is> AuthorDate: Wed Apr 3 18:36:45 2024 +0400 Remove obtain postgres APT repo signing key from mysql install script (#38700) (cherry picked from commit bfcb7658acbbe7c2f790e6cb03c0af2e7f9642cf) --- Dockerfile | 1 - Dockerfile.ci | 1 - scripts/docker/install_mysql.sh | 1 - 3 files changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index bd8b7bb38f..2113fef72f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -308,7 +308,6 @@ install_mariadb_client() { echo "${COLOR_YELLOW}MariaDB client protocol-compatible with MySQL client.${COLOR_RESET}" echo - curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - echo "deb [arch=amd64,arm64] https://archive.mariadb.org/mariadb-${MARIADB_LTS_VERSION}/repo/debian/ $(lsb_release -cs) main" > \ /etc/apt/sources.list.d/mariadb.list # Make sure that dependencies from MariaDB repo are preferred over Debian dependencies diff --git a/Dockerfile.ci b/Dockerfile.ci index fcd2a40068..ccdd28bbaa 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -254,7 +254,6 @@ install_mariadb_client() { echo "${COLOR_YELLOW}MariaDB client protocol-compatible with MySQL client.${COLOR_RESET}" echo - curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - echo "deb [arch=amd64,arm64] https://archive.mariadb.org/mariadb-${MARIADB_LTS_VERSION}/repo/debian/ $(lsb_release -cs) main" > \ /etc/apt/sources.list.d/mariadb.list # Make sure that dependencies from MariaDB repo are preferred over Debian dependencies diff --git a/scripts/docker/install_mysql.sh b/scripts/docker/install_mysql.sh index 3d8a3e2cd9..7795f6164a 100644 --- a/scripts/docker/install_mysql.sh +++ b/scripts/docker/install_mysql.sh @@ -98,7 +98,6 @@ install_mariadb_client() { echo "${COLOR_YELLOW}MariaDB client protocol-compatible with MySQL client.${COLOR_RESET}" echo - curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - echo "deb [arch=amd64,arm64] https://archive.mariadb.org/mariadb-${MARIADB_LTS_VERSION}/repo/debian/ $(lsb_release -cs) main" > \ /etc/apt/sources.list.d/mariadb.list # Make sure that dependencies from MariaDB repo are preferred over Debian dependencies