diff options
| author | Zuul <zuul@review.openstack.org> | 2019-02-22 14:53:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-02-22 14:53:30 +0000 |
| commit | 725bb6156a18e7639365b66387f067e492cc692e (patch) | |
| tree | 0e7693c0590ecddf8482fb56380dd3e8b3e83d55 /docker | |
| parent | 96b8816a5d13994a1a5ea6ae8ab2074ca1cbfe1c (diff) | |
| parent | ba6d7540f6f2a779c03b7319158a89ae0fb04ec8 (diff) | |
| download | kolla-725bb6156a18e7639365b66387f067e492cc692e.tar.gz kolla-725bb6156a18e7639365b66387f067e492cc692e.zip | |
Merge "debian/ubuntu: drop mysql compat stuff, unify on openssl 1.1"
Diffstat (limited to 'docker')
| -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 bebf79c1b..ad001488b 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -228,7 +228,9 @@ ENV DEBIAN_FRONTEND noninteractive 'ca-certificates', 'git', 'libffi-dev', + 'libmariadbclient-dev', 'libpq-dev', + 'libssl-dev', 'libxml2-dev', 'libxslt1-dev', 'libyaml-dev', @@ -238,28 +240,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")) }} |