diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-28 16:19:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-28 16:19:24 +0000 |
| commit | ecf85d8d78415a34335c4ce6d553df5ab3c9aa64 (patch) | |
| tree | 332b661e05eff4331f7e13f371a893060524c0a2 | |
| parent | 0824940bde5a9d79302670d31a7cdef07d9aee23 (diff) | |
| parent | a05d4d71a0744b5b25ff0a572bbed953d0d55239 (diff) | |
| download | kolla-ecf85d8d78415a34335c4ce6d553df5ab3c9aa64.tar.gz kolla-ecf85d8d78415a34335c4ce6d553df5ab3c9aa64.zip | |
Merge "Customizations for MariaDB"
| -rw-r--r-- | docker/mariadb/Dockerfile.j2 | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 9290b0286..50b0a0513 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -1,34 +1,31 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} -{% 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/* +{% import "macros.j2" as macros with context %} +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% 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 |