aboutsummaryrefslogtreecommitdiff
path: root/docker/monasca/monasca-api
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-04-11 09:39:28 +0000
committerGerrit Code Review <review@openstack.org>2022-04-11 09:39:28 +0000
commit657820362dd0b52f8462054e043fd892d14fbe76 (patch)
treed2675f8f172c08febc6f1eaf9900deec7b43c8ee /docker/monasca/monasca-api
parent26fd382f176adbc104850f565df238253d8f9fc7 (diff)
parent1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (diff)
downloadkolla-657820362dd0b52f8462054e043fd892d14fbe76.tar.gz
kolla-657820362dd0b52f8462054e043fd892d14fbe76.zip
Merge "docker: drop binary parts"
Diffstat (limited to 'docker/monasca/monasca-api')
-rw-r--r--docker/monasca/monasca-api/Dockerfile.j223
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