aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2025-12-02 15:36:50 +0100
committerMichal Nasiadka <mnasiadka@gmail.com>2025-12-02 15:51:27 +0000
commit3b1fe42e32a734fe555e9377b23faae4984a62ce (patch)
treedb20629c52d6d9ed7bf9ab5bb9c6842d8687c7ae
parentcbbc1b0bca94e0f768be8433ba4bd38cb6f0c583 (diff)
downloadkolla-3b1fe42e32a734fe555e9377b23faae4984a62ce.tar.gz
kolla-3b1fe42e32a734fe555e9377b23faae4984a62ce.zip
mariadb: Switch EL to mariadb upstream repos
Change-Id: I8fa363e7e9bc87195adaf218c46d6e9fb4575419 Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
-rw-r--r--docker/mariadb-server/Dockerfile.j25
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'