Merge "Customizations for MariaDB"

docker/mariadb/Dockerfile.j2

@@ -1,34 +1,31 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% import "macros.j2" as macros with context %}
+
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
-        MariaDB-Galera-server \
-        MariaDB-client \
-        rsync \
-        galera \
-        socat \
-        hostname \
-        percona-xtrabackup \
-        pv \
-        tar \
-        expect \
-    && yum clean all \
-    && rm -rf /var/lib/mysql/*
-
+    {% set mariadb_packages = [
+        'MariaDB-Galera-server',
+        'MariaDB-client',
+        'rsync',
+        'galera',
+        'socat',
+        'hostname',
+        'percona-xtrabackup',
+        'pv',
+        'tar',
+        'expect'
+    ] %}
 {% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN apt-get -y install --no-install-recommends \
-        mariadb-galera-server \
-        percona-xtrabackup \
-        socat \
-        expect \
-    && apt-get clean \
-    && rm -rf /var/lib/mysql/*
-
+    {% set mariadb_packages = [
+        'mariadb-galera-server',
+        'percona-xtrabackup',
+        'socat',
+        'expect'
+    ] %}
 {% endif %}
 
+{{ macros.install_packages(mariadb_packages | customizable("packages")) }}
 COPY mariadb_sudoers /etc/sudoers.d/kolla_mariadb_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 COPY security_reset.expect /usr/local/bin/kolla_security_reset
@@ -36,8 +33,11 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
     && chmod 755 /usr/local/bin/kolla_security_reset \
     && chmod 750 /etc/sudoers.d \
     && chmod 440 /etc/sudoers.d/kolla_mariadb_sudoers \
-    && usermod -a -G kolla mysql
+    && usermod -a -G kolla mysql \
+    && rm -rf /var/lib/mysql/*
 
+{% block mariadb_footer %}{% endblock %}
+{% block footer %}{% endblock %}
 {{ include_footer }}
 
 USER mysql