From 820a2bb8f19fc0a7bc9041c10f0f4bc8498287d3 Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Tue, 27 Jun 2023 20:14:42 +0200 Subject: [PATCH] Add libeos_dev on ARM runtime PROD image This is a follow-up after #31437. Seems that for ARM image, the BigQuery libraries require libgeos-dev library installed on system level not only to be built but also to be imported. --- Dockerfile | 2 +- Dockerfile.ci | 2 +- docs/docker-stack/changelog.rst | 7 ++++++- scripts/docker/install_os_dependencies.sh | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index befa5d9e4f588..35afca6672a77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -105,7 +105,7 @@ software-properties-common sqlite3 sudo unixodbc unixodbc-dev" function get_runtime_apt_deps() { if [[ "${RUNTIME_APT_DEPS=}" == "" ]]; then RUNTIME_APT_DEPS="apt-transport-https apt-utils ca-certificates \ -curl dumb-init freetds-bin gosu krb5-user \ +curl dumb-init freetds-bin gosu krb5-user libgeos-dev \ ldap-utils libffi7 libldap-2.4-2 libsasl2-2 libsasl2-modules libssl1.1 locales \ lsb-release netcat openssh-client python3-selinux rsync sasl2-bin sqlite3 sudo unixodbc" export RUNTIME_APT_DEPS diff --git a/Dockerfile.ci b/Dockerfile.ci index f325c1d25d2fb..6df47d6a8a494 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -65,7 +65,7 @@ software-properties-common sqlite3 sudo unixodbc unixodbc-dev" function get_runtime_apt_deps() { if [[ "${RUNTIME_APT_DEPS=}" == "" ]]; then RUNTIME_APT_DEPS="apt-transport-https apt-utils ca-certificates \ -curl dumb-init freetds-bin gosu krb5-user \ +curl dumb-init freetds-bin gosu krb5-user libgeos-dev \ ldap-utils libffi7 libldap-2.4-2 libsasl2-2 libsasl2-modules libssl1.1 locales \ lsb-release netcat openssh-client python3-selinux rsync sasl2-bin sqlite3 sudo unixodbc" export RUNTIME_APT_DEPS diff --git a/docs/docker-stack/changelog.rst b/docs/docker-stack/changelog.rst index 063748d2509f5..b40c0ae68fbd9 100644 --- a/docs/docker-stack/changelog.rst +++ b/docs/docker-stack/changelog.rst @@ -58,7 +58,12 @@ here so that users affected can find the reason for the changes. Airflow 2.6 ~~~~~~~~~~~~~ -* 2.6 +* 2.6.3 + + * Add ``libgeos-dev`` library to runtime PROD image as it is required by BigQuery library on ARM image + + +* 2.6.0 * Snowflake provider installed by default diff --git a/scripts/docker/install_os_dependencies.sh b/scripts/docker/install_os_dependencies.sh index 73bb43c6cc252..6aaa0ba561361 100644 --- a/scripts/docker/install_os_dependencies.sh +++ b/scripts/docker/install_os_dependencies.sh @@ -47,7 +47,7 @@ software-properties-common sqlite3 sudo unixodbc unixodbc-dev" function get_runtime_apt_deps() { if [[ "${RUNTIME_APT_DEPS=}" == "" ]]; then RUNTIME_APT_DEPS="apt-transport-https apt-utils ca-certificates \ -curl dumb-init freetds-bin gosu krb5-user \ +curl dumb-init freetds-bin gosu krb5-user libgeos-dev \ ldap-utils libffi7 libldap-2.4-2 libsasl2-2 libsasl2-modules libssl1.1 locales \ lsb-release netcat openssh-client python3-selinux rsync sasl2-bin sqlite3 sudo unixodbc" export RUNTIME_APT_DEPS