diff options
| author | Zuul <zuul@review.opendev.org> | 2025-12-02 22:22:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-12-02 22:22:30 +0000 |
| commit | b013f9ad1dd7a70fc4607a363edeae085d08adf3 (patch) | |
| tree | ac303652341335a1331bcb7ecea14a8aa641a5eb | |
| parent | 14a7644a1e458dcfe8e928d9ea032b0465da08f5 (diff) | |
| parent | 3b1fe42e32a734fe555e9377b23faae4984a62ce (diff) | |
| download | kolla-b013f9ad1dd7a70fc4607a363edeae085d08adf3.tar.gz kolla-b013f9ad1dd7a70fc4607a363edeae085d08adf3.zip | |
Merge "mariadb: Switch EL to mariadb upstream repos"
| -rw-r--r-- | docker/mariadb-server/Dockerfile.j2 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/docker/mariadb-server/Dockerfile.j2 b/docker/mariadb-server/Dockerfile.j2 index 8d17ff4ff..18811f36e 100644 --- a/docker/mariadb-server/Dockerfile.j2 +++ b/docker/mariadb-server/Dockerfile.j2 @@ -9,19 +9,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='mysql') }} -{# NOTE(mnasiadka): Use AppStream version of MariaDB for now in CentOS #} - {% if base_package_type == 'rpm' %} {# NOTE(mgoddard): EPEL required for pv package #} -{{ macros.enable_extra_repos(['epel']) }} +{{ macros.enable_extra_repos(['epel', 'mariadb']) }} {% set mariadb_packages = [ 'expect', 'mariadb', 'mariadb-backup', 'mariadb-server', - 'mariadb-server-galera', 'pv', 'rsync', 'tar' |