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/monasca/monasca-api | |
| 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/monasca/monasca-api')
| -rw-r--r-- | docker/monasca/monasca-api/Dockerfile.j2 | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/docker/monasca/monasca-api/Dockerfile.j2 b/docker/monasca/monasca-api/Dockerfile.j2 index 9469908f3..5e83a6759 100644 --- a/docker/monasca/monasca-api/Dockerfile.j2 +++ b/docker/monasca/monasca-api/Dockerfile.j2 @@ -7,20 +7,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - - {% if base_package_type == 'rpm' %} - {% set monasca_api_packages = [ - ] %} - {% elif base_package_type == 'deb' %} - {% set monasca_api_packages = [ - ] %} - {% endif %} +{% if base_package_type == 'rpm' %} + {% set monasca_api_packages = [ + ] %} +{% elif base_package_type == 'deb' %} + {% set monasca_api_packages = [ + ] %} +{% endif %} {{ macros.install_packages(monasca_api_packages | customizable("packages")) }} ADD monasca-api-archive /monasca-api-source @@ -33,8 +26,6 @@ ADD monasca-api-archive /monasca-api-source RUN ln -s monasca-api-source/* monasca-api \ && {{ macros.install_pip(monasca_api_pip_packages | customizable("pip_packages")) }} -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_monasca_extend_start RUN chmod 755 /usr/local/bin/kolla_monasca_extend_start |