aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin@juszkiewicz.com.pl>2022-04-01 12:56:56 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-04-02 13:46:51 +0000
commita8fcb02f40c94c2101edff9ec4a3101d1d14fe97 (patch)
treedf891a216b274a48efaa6593ca48b2c4cb8ad8c8
parent089899d8804fbc9f5d2509fe6c50a7a25f45231f (diff)
downloadkolla-a8fcb02f40c94c2101edff9ec4a3101d1d14fe97.tar.gz
kolla-a8fcb02f40c94c2101edff9ec4a3101d1d14fe97.zip
cloudkitty-api: make sure that we install packages
Debuntu binary images did not got packages installed. Change-Id: Ie28e8580406f3f805500ed4020895e5e9ebf7c31
-rw-r--r--docker/cloudkitty/cloudkitty-api/Dockerfile.j26
1 files changed, 2 insertions, 4 deletions
diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2
index 4932c8a30..f49f43ecb 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