diff options
| author | Zuul <zuul@review.opendev.org> | 2025-07-17 11:54:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-07-17 11:54:34 +0000 |
| commit | 5d2dfc0eb9fac7d22a04665173fe650b61985d19 (patch) | |
| tree | 8962ae2c35df1ae753ccaa14e1084e73e02dda66 /docker/mariadb | |
| parent | ba2b4bb56415b9bd7b690dcf077bb59cf4083f05 (diff) | |
| parent | 9e36b8976657e5aaf285f4ab9f65603ab475fd89 (diff) | |
| download | kolla-5d2dfc0eb9fac7d22a04665173fe650b61985d19.tar.gz kolla-5d2dfc0eb9fac7d22a04665173fe650b61985d19.zip | |
Merge "Move to CentOS Stream 10"
Diffstat (limited to 'docker/mariadb')
| -rw-r--r-- | docker/mariadb/mariadb-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/mariadb/mariadb-server/Dockerfile.j2 | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/docker/mariadb/mariadb-base/Dockerfile.j2 b/docker/mariadb/mariadb-base/Dockerfile.j2 index e4e17a8bf..ddf6d50d9 100644 --- a/docker/mariadb/mariadb-base/Dockerfile.j2 +++ b/docker/mariadb/mariadb-base/Dockerfile.j2 @@ -9,14 +9,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='mysql') }} -{{ macros.enable_extra_repos(['mariadb']) }} - +{# NOTE(mnasiadka): Using AppStream packages on CS10 for now #} {% if base_package_type == 'rpm' %} {% set mariadb_base_packages = [ 'mariadb', ] %} {% elif base_package_type == 'deb' %} +{{ macros.enable_extra_repos(['mariadb']) }} {% set mariadb_base_packages = [ 'mariadb-client', ] %} diff --git a/docker/mariadb/mariadb-server/Dockerfile.j2 b/docker/mariadb/mariadb-server/Dockerfile.j2 index ec17a5055..55dd8b5b6 100644 --- a/docker/mariadb/mariadb-server/Dockerfile.j2 +++ b/docker/mariadb/mariadb-server/Dockerfile.j2 @@ -10,13 +10,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='mysql') }} {# NOTE(mgoddard): EPEL required for pv package #} -{{ macros.enable_extra_repos(['epel', 'mariadb']) }} +{# NOTE(mnasiadka): Use AppStream version of MariaDB for now in CentOS #} +{{ macros.enable_extra_repos(['epel']) }} {% if base_package_type == 'rpm' %} {% set mariadb_packages = [ 'expect', 'mariadb-backup', 'mariadb-server', + 'mariadb-server-galera', 'pv', 'rsync', 'tar' @@ -26,6 +28,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build RUN ln -s /usr/lib64/galera-4 /usr/lib64/galera {% elif base_package_type == 'deb' %} +{{ macros.enable_extra_repos(['mariadb']) }} {% set mariadb_packages = [ 'expect', 'mariadb-backup', |
