Use mariadb by default when build final prod image (#36716)

Dockerfile

@@ -1470,7 +1470,7 @@ ARG RUNTIME_APT_COMMAND="echo"
 ARG ADDITIONAL_RUNTIME_APT_COMMAND=""
 ARG ADDITIONAL_RUNTIME_APT_ENV=""
 ARG INSTALL_MYSQL_CLIENT="true"
-ARG INSTALL_MYSQL_CLIENT_TYPE="mysql"
+ARG INSTALL_MYSQL_CLIENT_TYPE="mariadb"
 ARG INSTALL_MSSQL_CLIENT="true"
 ARG INSTALL_POSTGRES_CLIENT="true"
 

docker_tests/test_prod_image.py

@@ -158,6 +158,7 @@ def test_pip_dependencies_conflict(self):
         "grpc": ["grpc", "google.auth", "google_auth_httplib2"],
         "hashicorp": ["hvac"],
         "ldap": ["ldap"],
+        "mysql": ["MySQLdb", *(["mysql"] if bool(find_spec("mysql")) else [])],
         "postgres": ["psycopg2"],
         "pyodbc": ["pyodbc"],
         "redis": ["redis"],
@@ -167,8 +168,6 @@ def test_pip_dependencies_conflict(self):
         "statsd": ["statsd"],
         "virtualenv": ["virtualenv"],
     }
-    if bool(find_spec("mysql")):
-        PACKAGE_IMPORTS["mysql"] = ["mysql"]
 
     @pytest.mark.skipif(os.environ.get("TEST_SLIM_IMAGE") == "true", reason="Skipped with slim image")
     @pytest.mark.parametrize("package_name,import_names", PACKAGE_IMPORTS.items())

docs/docker-stack/changelog.rst

@@ -37,6 +37,12 @@ the Airflow team.
 Airflow 2.8
 ~~~~~~~~~~~
 
+* 2.8.1
+
+   * Fixed a discrepancy in MySQL client libraries. In 2.8.0 if not specify ``INSTALL_MYSQL_CLIENT_TYPE`` build arg
+     during build custom X86 image by default packages would be compiled by using **MariaDB** libraries,
+     however **MySQL** libraries were installed in the final image.
+
 * 2.8.0
 
    * Add ``libxmlsec1`` and ``libxmlsec1-dev`` libraries to dev PROD image and ``libxmlsec1`` library to runtime PROD