diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-10 11:13:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-10 11:13:53 +0000 |
| commit | cf6209f2df22a34a3cc8f6dd96861358e1eed2dd (patch) | |
| tree | ac853e4c7b0a2117d0f968f9a6e414a87850740d /docker | |
| parent | e4fa28715856ed71351f4a6d13e3f2326df12281 (diff) | |
| parent | 4ff615d6d41141868149f318728ea07b3ca847ae (diff) | |
| download | kolla-cf6209f2df22a34a3cc8f6dd96861358e1eed2dd.tar.gz kolla-cf6209f2df22a34a3cc8f6dd96861358e1eed2dd.zip | |
Merge "handle mariadb for aarch64/ubuntu/source"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | docker/mariadb/Dockerfile.j2 | 15 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 10 |
3 files changed, 29 insertions, 6 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 2bc220529..aee5a2045 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -49,13 +49,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build '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 6e221c09d..7f22e1269 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -44,10 +44,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build '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 f1cf2dffc..1bc4c7076 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 + [ |