From d8708b713afa96f23b00d53197811eb04270a6ff Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 1 Apr 2022 12:56:56 +0200 Subject: [PATCH] cloudkitty-api: make sure that we install packages Debuntu binary images did not got packages installed. Change-Id: Ie28e8580406f3f805500ed4020895e5e9ebf7c31 (cherry picked from commit a8fcb02f40c94c2101edff9ec4a3101d1d14fe97) --- docker/cloudkitty/cloudkitty-api/Dockerfile.j2 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index 4932c8a30b..f49f43ecbb 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -13,8 +13,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set cloudkitty_api_packages = [ 'openstack-cloudkitty-api' ] %} -{{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }} - {% elif base_package_type == 'deb' %} {% set cloudkitty_api_packages = [ @@ -23,12 +21,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} {% elif install_type == 'source' %} - {% set cloudkitty_api_packages = [ ] %} -{{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }} {% endif %} +{{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }} + COPY extend_start.sh /usr/local/bin/kolla_cloudkitty_extend_start RUN chmod 755 /usr/local/bin/kolla_cloudkitty_extend_start