From a729d132d6a8a891dc0ab92c9bda094a59cea231 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Tue, 26 Dec 2017 16:18:14 +0800 Subject: Consume RDO packaged mariadb version RDO packaged mariadb recieves far more testing and qualification than any other mariadb package on CentOS. Lets use that instead of a hard-pinned old version of mariadb from mariadb.org. This patch also upgrade MariaDB from 10.0 to 10.1.20 for RHEL/CentOS/Oracle Linux. Depends-On: I8374ac2219ad7880970cd789727d01af7cac1077 Depends-On: Ia2acb09e877a586243fc1acb49d8d140cf27d7b5 Co-Authored-By: Xinliang Liu Change-Id: I071362fc1b8d60199a77e2fe0475d2b4c3b5341b --- docker/openstack-base/Dockerfile.j2 | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'docker/openstack-base') diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index dc50b2ec5..97ad60c4f 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -160,12 +160,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'tcp_wrappers-libs' ] %} - {% if base_arch == 'x86_64' %} - {% set openstack_base_packages = openstack_base_packages + [ - 'Percona-Server-shared-56' - ] %} - {% endif %} - {% elif base_distro in ['debian', 'ubuntu'] %} # This will prevent questions from being asked during the install @@ -211,6 +205,7 @@ ENV DEBIAN_FRONTEND noninteractive 'libxml2-devel', 'libxslt-devel', 'libyaml-devel', + 'mariadb-devel', 'openldap-devel', 'openssl-devel', 'postgresql', @@ -220,19 +215,6 @@ ENV DEBIAN_FRONTEND noninteractive 'zip' ] %} - # On x86-64 packages from external repos are used. lowercase names goes - # conflicts and build fails. Other architectures use standard CentOS - # packages. - {% if base_arch == 'x86_64' %} - {% set openstack_base_packages = openstack_base_packages + [ - 'MariaDB-devel' - ] %} - {% else %} - {% set openstack_base_packages = openstack_base_packages + [ - 'mariadb-devel' - ] %} - {% endif %} - {% elif base_distro in ['debian', 'ubuntu'] %} {% set openstack_base_packages = [ 'build-essential', -- cgit v1.2.3