diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2017-08-29 15:30:41 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2017-08-31 12:35:14 +0200 |
| commit | f436e7bb450f567a72e0f1b7a3df689638d772df (patch) | |
| tree | 9ae4fe8a5798903bae9e3725ec3ba4bcd88efc1c /docker/openstack-base | |
| parent | 44f5923199b9286668f867b2a6e0135b67c5cb18 (diff) | |
| download | kolla-f436e7bb450f567a72e0f1b7a3df689638d772df.tar.gz kolla-f436e7bb450f567a72e0f1b7a3df689638d772df.zip | |
openstack-base: link everything with OpenSSL 1.0.x instead of 1.1
OpenSSL 1.1 is not fully source compatible with 1.0.x so
python-qpid-proton fails to build for Debian (which uses OpenSSL 1.1 as
default).
Installing development package for 1.0.2 gets it back to buildable
state.
Python-qpid-proton is fixed upstream but no release was made yet.
Closes-Bug: #1714218
Change-Id: I731fe92410f340105e1a53372d33fdbb4798eaa3
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index e9d184709..846c8fc6d 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', - 'libssl-dev', 'libxml2-dev', 'libxslt1-dev', 'libyaml-dev', @@ -259,10 +258,17 @@ ENV DEBIAN_FRONTEND noninteractive 'libmariadbclient-dev' ] %} {% endif %} + # Debian/stretch ships libmysqlclient.so in separate package + # Debian/stretch uses OpenSSL 1.1 as default, we need 1.0.2 one {% if base_distro == 'debian' %} {% set openstack_base_packages = openstack_base_packages + [ - 'libmariadbclient-dev-compat' + 'libmariadbclient-dev-compat', + 'libssl1.0-dev', + ] %} + {% else %} + {% set openstack_base_packages = openstack_base_packages + [ + 'libssl-dev', ] %} {% endif %} {% endif %} |