From 4ff615d6d41141868149f318728ea07b3ca847ae Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
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/kolla-toolbox/Dockerfile.j2  | 10 +++++++++-
 docker/mariadb/Dockerfile.j2        | 15 +++++++++++----
 docker/openstack-base/Dockerfile.j2 | 10 +++++++++-
 3 files changed, 29 insertions(+), 6 deletions(-)

(limited to 'docker')

diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index ff3d760fc..e95eee74b 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -50,13 +50,21 @@ LABEL maintainer="{{ maintainer }}"
         'git',
         'jq',
         'libffi-dev',
-        'libmariadbclient-dev',
         'libssl-dev',
         'libxslt1-dev',
         'mariadb-client',
         'python-dev'
      ] %}
 
+    {% if base_arch == 'aarch64' and base_distro == 'ubuntu' %}
+         {% set kolla_toolbox_packages = kolla_toolbox_packages + [
+             'libmysqlclient-dev'
+         ] %}
+    {% else %}
+         {% set kolla_toolbox_packages = kolla_toolbox_packages + [
+             'libmariadbclient-dev'
+         ] %}
+    {% endif %}
     # Debian/stretch ships libmysqlclient.so in separate package
     {% if base_distro == 'debian' %}
         {% set kolla_toolbox_packages = kolla_toolbox_packages + [
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2
index f54bb717e..98b5be142 100644
--- a/docker/mariadb/Dockerfile.j2
+++ b/docker/mariadb/Dockerfile.j2
@@ -44,10 +44,17 @@ LABEL maintainer="{{ maintainer }}"
             'mariadb-server'
         ] %}
     {% else %}
-        {% set mariadb_packages = mariadb_packages + [
-            'mariadb-galera-server',
-            'percona-xtrabackup'
-        ] %}
+        {% if base_arch == 'aarch64' %}
+            {% set mariadb_packages = mariadb_packages + [
+                'mariadb-server',
+                'percona-xtrabackup'
+            ] %}
+        {% else %}
+            {% set mariadb_packages = mariadb_packages + [
+                'mariadb-galera-server',
+                'percona-xtrabackup'
+            ] %}
+        {% endif %}
     {% endif %}
 {% endif %}
 
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