aboutsummaryrefslogtreecommitdiff
path: root/docker/mariadb
diff options
context:
space:
mode:
Diffstat (limited to 'docker/mariadb')
-rw-r--r--docker/mariadb/mariadb-base/Dockerfile.j24
-rw-r--r--docker/mariadb/mariadb-server/Dockerfile.j25
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',