Skip to content

Use mariadb by default when build final prod image #36716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 3 commits into from
Jan 10, 2024
Merged

Use mariadb by default when build final prod image #36716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e183fc
Use `mariadb` by default when build final prod image
Taragolis Jan 10, 2024
e07ab89
Add release notes
Taragolis Jan 10, 2024
d59dfa3
Validate import MySQLdb (mysqlclient) in prod image test
Taragolis Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 1 addition & 2 deletions docker_tests/test_prod_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -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())
Expand Down
6 changes: 6 additions & 0 deletions docs/docker-stack/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down