From 4ff615d6d41141868149f318728ea07b3ca847ae Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 28 Apr 2017 16:54:05 +0200 Subject: handle mariadb for aarch64/ubuntu/source Ubuntu builds use external MariaDB repository on x86-64 and ppc64le. But that repo does not provide packages for AArch64 so I use mariadb/mysql packages from distribution instead. Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: Ia3c3d3858082613718626670f9ff11b69d913c40 --- docker/openstack-base/Dockerfile.j2 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'docker/openstack-base') diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 719e737fb..cf9c7d0c7 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -240,7 +240,6 @@ ENV DEBIAN_FRONTEND noninteractive 'ca-certificates', 'git', 'libffi-dev', - 'libmariadbclient-dev', 'libssl-dev', 'libxml2-dev', 'libxslt1-dev', @@ -251,6 +250,15 @@ ENV DEBIAN_FRONTEND noninteractive 'zip' ] %} + {% if base_arch == 'aarch64' and base_distro == 'ubuntu' %} + {% set openstack_base_packages = openstack_base_packages + [ + 'libmysqlclient-dev' + ] %} + {% else %} + {% set openstack_base_packages = openstack_base_packages + [ + 'libmariadbclient-dev' + ] %} + {% endif %} # Debian/stretch ships libmysqlclient.so in separate package {% if base_distro == 'debian' %} {% set openstack_base_packages = openstack_base_packages + [ -- cgit v1.2.3