diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2018-12-14 11:27:50 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-02-19 11:39:07 +0000 |
| commit | ba6d7540f6f2a779c03b7319158a89ae0fb04ec8 (patch) | |
| tree | 1b56b7e97589de8c851d270d79a93f5669930c93 | |
| parent | dc20a3a0b6001185362e99e30531f2712cc6af57 (diff) | |
| download | kolla-ba6d7540f6f2a779c03b7319158a89ae0fb04ec8.tar.gz kolla-ba6d7540f6f2a779c03b7319158a89ae0fb04ec8.zip | |
debian/ubuntu: drop mysql compat stuff, unify on openssl 1.1
Now with Ubuntu 'bionic' being used we can drop
libmysqlclient-compat-dev package use and just go with mariadb packages
directly.
Also move to OpenSSL 1.1 for both distributions.
Change-Id: I147385a3da15878121c0a436b5c26ba100e9802d
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 18 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 24 |
2 files changed, 3 insertions, 39 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 90bde2493..768ebd2dd 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -37,28 +37,12 @@ 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 + [ - 'libmariadbclient-dev-compat' - ] %} - {% endif %} - {% endif %} {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 7af8cf02a..3aa308259 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -229,7 +229,9 @@ ENV DEBIAN_FRONTEND noninteractive 'ca-certificates', 'git', 'libffi-dev', + 'libmariadbclient-dev', 'libpq-dev', + 'libssl-dev', 'libxml2-dev', 'libxslt1-dev', 'libyaml-dev', @@ -239,28 +241,6 @@ 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 - # 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', - 'libssl1.0-dev', - ] %} - {% else %} - {% set openstack_base_packages = openstack_base_packages + [ - 'libssl-dev', - ] %} - {% endif %} {% endif %} {{ macros.install_packages(openstack_base_packages | customizable("packages")) }} |