diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-03-29 12:36:22 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-04-10 09:13:27 +0200 |
| commit | 21b04376e3339e1cb987e6877e8431ea054c6502 (patch) | |
| tree | ddb894c438316b5e5d1e6c2465d05887263508d7 /docker/openstack-base | |
| parent | 76bc0f69cc801a5e5796f1a8a70c13d6355bd6c8 (diff) | |
| download | kolla-21b04376e3339e1cb987e6877e8431ea054c6502.tar.gz kolla-21b04376e3339e1cb987e6877e8431ea054c6502.zip | |
mariadb: handle lack of external repos on non x86
MariaDB-* packages are from external 'x86_64 only' repository. Other
architectures use CentOS packages.
Split needs to be done as 'mariadb-devel' is provided by three different
packages on x86-64.
Partially-Implements: blueprint multiarch-and-arm64-containers
Depends-On: I71ddb7ef57c64d2505cac96724b1ab6772a57d6a
Change-Id: I9f3394eb35723f2bbf3205c6af6101b5a9daed38
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 9dbd6246f..01db2013d 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -206,7 +206,6 @@ ENV DEBIAN_FRONTEND noninteractive 'libxml2-devel', 'libxslt-devel', 'libyaml-devel', - 'MariaDB-devel', 'openldap-devel', 'openssl-devel', 'postgresql', @@ -215,6 +214,20 @@ ENV DEBIAN_FRONTEND noninteractive 'sqlite-devel', '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', |