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/kolla-toolbox | |
| 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/kolla-toolbox')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 10 |
1 files changed, 9 insertions, 1 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 + [ |