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/openstack-base/Dockerfile.j2 | 1 - 1 file changed, 1 deletion(-) (limited to 'docker/openstack-base') diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 247576b2b..03d85a3a7 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -160,7 +160,6 @@ ENV DEBIAN_FRONTEND noninteractive 'make', 'mariadb-devel', 'mod_ssl', - 'openldap-devel', 'openssl', 'openssl-devel', 'pcre-devel', -- cgit v1.2.3