From 1b41f2e682f15dd5f3eb0fb09d61c35f18607bb8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 1 Nov 2021 14:28:19 +0100 Subject: gnocchi: do not install cradox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Project description says: /!DON’T USE IT, but use upstream python-rados, except you really can’t /! Also installing it created errors which are silently ignored. Change-Id: Id24458cd655aeace0e745c512aa7890b3edda51c --- docker/gnocchi/gnocchi-base/Dockerfile.j2 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 437cb9153..0b68c34f9 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -23,7 +23,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-boto3', 'python3-rados', ] %} -{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }} {% elif base_package_type == 'deb' %} {% set gnocchi_base_packages = [ @@ -36,14 +35,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-setuptools', 'python3-wheel' ] %} - {% set gnocchi_base_pip_packages = [ - 'cradox' - ] %} + {% endif %} {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }} -RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages"), constraints=false) }} - - {% endif %} {% elif install_type == 'source' %} {% if base_package_type == 'rpm' %} -- cgit v1.2.3