diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-01 13:41:14 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-09 17:44:26 +0200 |
| commit | 1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (patch) | |
| tree | 05427aa46ce6473684cfe2a824798306291546c9 /docker/cloudkitty | |
| parent | cabfd0f3eff38e2c10cdc7cf4e9271d72eeca91a (diff) | |
| download | kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.tar.gz kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.zip | |
docker: drop binary parts
Big patch drops all mentions of binary images support. Suggestions are
welcome how to split it into parts or handle better.
Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3
Diffstat (limited to 'docker/cloudkitty')
| -rw-r--r-- | docker/cloudkitty/cloudkitty-api/Dockerfile.j2 | 19 | ||||
| -rw-r--r-- | docker/cloudkitty/cloudkitty-base/Dockerfile.j2 | 21 | ||||
| -rw-r--r-- | docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 | 18 |
3 files changed, 4 insertions, 54 deletions
diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index f49f43ecb..a0588dd48 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -7,23 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - - {% set cloudkitty_api_packages = [ - 'openstack-cloudkitty-api' - ] %} - {% elif base_package_type == 'deb' %} - - {% set cloudkitty_api_packages = [ - 'cloudkitty-api' - ] %} - - {% endif %} -{% elif install_type == 'source' %} - {% set cloudkitty_api_packages = [ - ] %} -{% endif %} +{% set cloudkitty_api_packages = [ +] %} {{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }} diff --git a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 index 483a2af42..641812846 100644 --- a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 @@ -9,25 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='cloudkitty') }} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - - {% set cloudkitty_base_packages = [ - 'openstack-cloudkitty-common', - ] %} - - {% elif base_package_type == 'deb' %} - - {% set cloudkitty_base_packages = [ - 'cloudkitty-common', - ] %} - - {% endif %} - -{{ macros.install_packages(cloudkitty_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - {% set cloudkitty_base_pip_packages = [ '/cloudkitty' ] %} @@ -39,8 +20,6 @@ RUN ln -s cloudkitty-base-source/* cloudkitty \ && cp -r /cloudkitty/etc/cloudkitty/* /etc/cloudkitty/ \ && chown -R cloudkitty: /etc/cloudkitty -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_cloudkitty_extend_start \ diff --git a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 index 136bfffbf..2a128c4e0 100644 --- a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 @@ -7,22 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - - {% set cloudkitty_processor_packages = [ - 'openstack-cloudkitty-processor', - ] %} - - {% elif base_package_type == 'deb' %} - - {% set cloudkitty_processor_packages = [ - 'cloudkitty-processor', - ] %} - - {% endif %} - -{% endif %} +{% set cloudkitty_processor_packages = [ +] %} {{ macros.install_packages(cloudkitty_processor_packages | customizable("packages")) }} |
