diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-20 12:00:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-20 12:00:47 +0000 |
| commit | 632f1774b95dbbc9c96cb46d838665362c75d934 (patch) | |
| tree | 249dd18daf41c089ed3764ddfe3549c56a7a886a /docker/openstack-base | |
| parent | a34a7a01a6050f2e0890023df308ca06a815cefe (diff) | |
| parent | f98a8d6287b8260f2d2731118cc40bfffe75b156 (diff) | |
| download | kolla-632f1774b95dbbc9c96cb46d838665362c75d934.tar.gz kolla-632f1774b95dbbc9c96cb46d838665362c75d934.zip | |
Merge "debian: move to stretch"
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 38edfcc08..49b6bbe20 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -237,6 +237,13 @@ ENV DEBIAN_FRONTEND noninteractive 'python-dev', 'zip' ] %} + + # Debian/stretch ships libmysqlclient.so in separate package + {% if base_distro == 'debian' %} + {% set openstack_base_packages = openstack_base_packages + [ + 'libmariadbclient-dev-compat' + ] %} + {% endif %} {% endif %} {{ macros.install_packages(openstack_base_packages | customizable("packages")) }} |