diff options
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 20 |
1 files changed, 1 insertions, 19 deletions
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', |