diff options
Diffstat (limited to 'docker_templates/base')
| -rwxr-xr-x | docker_templates/base/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker_templates/base/mariadb.yum.repo | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/docker_templates/base/Dockerfile.j2 b/docker_templates/base/Dockerfile.j2 index 807f3fe6c..b3b0c776a 100755 --- a/docker_templates/base/Dockerfile.j2 +++ b/docker_templates/base/Dockerfile.j2 @@ -7,6 +7,13 @@ ENV KOLLA_BASE_DISTRO {{ base_distro }} ENV KOLLA_INSTALL_TYPE {{ install_type }} {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + +# Turns on galera repos throughout the build +COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo + +RUN yum install -y http://www.percona.com/redir/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm \ + && sed -i 's|$releasever|centos/latest|g' /etc/yum.repos.d/percona-release.repo + {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux'] %} @@ -57,7 +64,6 @@ RUN yum update -y \ RUN yum install -y \ git \ iproute \ - mariadb \ mariadb-libs \ openssl \ openstack-utils \ @@ -165,7 +171,6 @@ RUN yum update -y \ libffi-devel \ libxml2-devel \ libxslt-devel \ - mariadb \ mariadb-devel \ mysql-devel \ MySQL-python \ diff --git a/docker_templates/base/mariadb.yum.repo b/docker_templates/base/mariadb.yum.repo new file mode 100644 index 000000000..564ce3f0e --- /dev/null +++ b/docker_templates/base/mariadb.yum.repo @@ -0,0 +1,5 @@ +[mariadb] +name = MariaDB +baseurl = http://yum.mariadb.org/10.0/centos7-amd64 +gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB +gpgcheck=1 |