From 6319bc6f559ab5c49a7ad701b606b58af62337b0 Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Mon, 10 Aug 2020 21:14:07 +0200 Subject: Remove weird deps This is a follow-up on "Refactor httpd install to base image" [1]. It seems a copy-paste algorithm was used to craft Dockerfiles for some httpd-enabled services which resulted in an abundance of ldappool packages getting installed, even in the 'source' case. This seems to have also kept ldappool at a lower version because it did not get updated via pip later. This patch deals with that and also moves ldap deps for Keystone to their proper place in 'source' case (extras). Note Keystone client gets installed in openstack-base. Cinder does not need to include Keystone either. [1] https://review.opendev.org/744037 Change-Id: I017d7a6a5d2b1ae6c04556dcf172453a36de5be7 --- docker/vitrage/vitrage-api/Dockerfile.j2 | 2 -- docker/vitrage/vitrage-base/Dockerfile.j2 | 2 -- 2 files changed, 4 deletions(-) (limited to 'docker/vitrage') diff --git a/docker/vitrage/vitrage-api/Dockerfile.j2 b/docker/vitrage/vitrage-api/Dockerfile.j2 index a4f1a78ba..e579f05fa 100644 --- a/docker/vitrage/vitrage-api/Dockerfile.j2 +++ b/docker/vitrage/vitrage-api/Dockerfile.j2 @@ -13,7 +13,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set vitrage_api_packages = [ 'openstack-vitrage-api', - 'python3-ldappool' ] %} {{ macros.install_packages(vitrage_api_packages | customizable("packages")) }} @@ -22,7 +21,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro == 'debian' %} {% set vitrage_api_packages = [ - 'python3-ldappool', 'vitrage-api' ] %} diff --git a/docker/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2 index 0fb62b3da..c61ad3517 100644 --- a/docker/vitrage/vitrage-base/Dockerfile.j2 +++ b/docker/vitrage/vitrage-base/Dockerfile.j2 @@ -45,7 +45,6 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% if base_package_type == 'rpm' %} {% set vitrage_base_packages = [ - 'python3-ldappool' ] %} {{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} @@ -53,7 +52,6 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% elif base_package_type == 'deb' %} {% set vitrage_base_packages = [ - 'python3-ldappool' ] %} {{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} -- cgit v1.2.3