[airflow] 11/27: Add MSSQL support for ARM Docker images (#28533)

[ep...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ephraimanierobi pushed a commit to branch v2-5-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit 3edf7d4872b3cca5eb0159ff1b1e4d5535344d98
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Thu Dec 22 14:02:24 2022 +0100

    Add MSSQL support for ARM Docker images (#28533)
    
    The #28530 re-enabled support for pymssql installation on ARM. Even
    if we have no binary wheels, pymssql seems to build cleanly.
    
    This is a follow up, to enable mssql client installation for ARM
    for our images. It also adds docuemntation in Docker image docs
    to explain it.
    
    (cherry picked from commit 9c3734bb127ff0d71a0321d0578e556552cfc934)
---
 Dockerfile                      |  5 -----
 Dockerfile.ci                   |  5 -----
 docs/docker-stack/changelog.rst |  8 ++++++++
 docs/docker-stack/index.rst     | 14 ++++++++++++++
 docs/spelling_wordlist.txt      |  1 +
 scripts/docker/install_mssql.sh |  5 -----
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bab2cda06a..bc8502982c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -275,11 +275,6 @@ function install_mssql_client() {
     apt-get clean && rm -rf /var/lib/apt/lists/*
 }
 
-if [[ $(uname -m) == "arm64" || $(uname -m) == "aarch64" ]]; then
-    # disable MSSQL for ARM64
-    INSTALL_MSSQL_CLIENT="false"
-fi
-
 install_mssql_client "${@}"
 EOF
 
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 0713cc8b71..95ab395053 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -235,11 +235,6 @@ function install_mssql_client() {
     apt-get clean && rm -rf /var/lib/apt/lists/*
 }
 
-if [[ $(uname -m) == "arm64" || $(uname -m) == "aarch64" ]]; then
-    # disable MSSQL for ARM64
-    INSTALL_MSSQL_CLIENT="false"
-fi
-
 install_mssql_client "${@}"
 EOF
 
diff --git a/docs/docker-stack/changelog.rst b/docs/docker-stack/changelog.rst
index 37a4420266..412d5b6137 100644
--- a/docs/docker-stack/changelog.rst
+++ b/docs/docker-stack/changelog.rst
@@ -55,6 +55,14 @@ here so that users affected can find the reason for the changes.
 |              |                     |                                         | on 17 Jan 2022         |                                              |
 +--------------+---------------------+-----------------------------------------+------------------------+----------------------------------------------+
 
+Airflow 2.5.1
+~~~~~~~~~~~~~
+
+* 2.5.1
+
+  * The ARM experimental image adds support for MSSQL
+
+
 Airflow 2.5
 ~~~~~~~~~~~
 
diff --git a/docs/docker-stack/index.rst b/docs/docker-stack/index.rst
index 2ce60a37ea..be8877be06 100644
--- a/docs/docker-stack/index.rst
+++ b/docs/docker-stack/index.rst
@@ -83,6 +83,20 @@ are also images published from branches but they are used mainly for development
 See `Airflow Git Branching <https://github.com/apache/airflow/blob/main/CONTRIBUTING.rst#airflow-git-branches>`_
 for details.
 
+Support
+=======
+
+The reference Docker Image supports the following platforms and database:
+
+
+* Intel platform (x86_64)
+  * Postgres Client
+  * MySQL Client
+  * MSSQL Client
+
+* ARM platform (aarch64) - experimental support, might change any time
+  * Postgres Client
+  * MSSQL Client
 
 Usage
 =====
diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
index 5b186ae821..f019d2a8c0 100644
--- a/docs/spelling_wordlist.txt
+++ b/docs/spelling_wordlist.txt
@@ -1,3 +1,4 @@
+aarch
 abc
 accessor
 accountmaking
diff --git a/scripts/docker/install_mssql.sh b/scripts/docker/install_mssql.sh
index 6765b060d4..fa0cfc0033 100644
--- a/scripts/docker/install_mssql.sh
+++ b/scripts/docker/install_mssql.sh
@@ -51,9 +51,4 @@ function install_mssql_client() {
     apt-get clean && rm -rf /var/lib/apt/lists/*
 }
 
-if [[ $(uname -m) == "arm64" || $(uname -m) == "aarch64" ]]; then
-    # disable MSSQL for ARM64
-    INSTALL_MSSQL_CLIENT="false"
-fi
-
 install_mssql_client "${@}"