diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-08-31 13:56:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-08-31 13:56:29 +0000 |
| commit | 66014b50753f27d2b7dc6d864840f6d677636c34 (patch) | |
| tree | 64b6ed8840b639784fa62b59b084537d1b7e5ad6 /docker | |
| parent | 13bccdc612bb356fc9bcf75d4f2ec00861e76487 (diff) | |
| parent | f436e7bb450f567a72e0f1b7a3df689638d772df (diff) | |
| download | kolla-66014b50753f27d2b7dc6d864840f6d677636c34.tar.gz kolla-66014b50753f27d2b7dc6d864840f6d677636c34.zip | |
Merge "openstack-base: link everything with OpenSSL 1.0.x instead of 1.1"
Diffstat (limited to 'docker')
| -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 %} |